Compare commits
10 Commits
e7dca3a021
...
rename/cha
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
df41ecbd30 | ||
| 6e7bf028c1 | |||
| 2761ee156a | |||
| cd909d59c4 | |||
|
|
f5cc098b7b | ||
|
|
4d7b7618b2 | ||
|
|
910a5c2606 | ||
| bdc243224b | |||
| 5981c750a4 | |||
| 6cfab21eaa |
@@ -1,8 +1,8 @@
|
|||||||
.git
|
.git
|
||||||
*.md
|
*.md
|
||||||
!README.md
|
!README.md
|
||||||
chatd
|
neoircd
|
||||||
chat-cli
|
neoirc-cli
|
||||||
data.db
|
data.db
|
||||||
data.db-wal
|
data.db-wal
|
||||||
data.db-shm
|
data.db-shm
|
||||||
|
|||||||
4
.gitignore
vendored
4
.gitignore
vendored
@@ -21,7 +21,7 @@ node_modules/
|
|||||||
*.key
|
*.key
|
||||||
|
|
||||||
# Build artifacts
|
# Build artifacts
|
||||||
/chatd
|
/neoircd
|
||||||
/bin/
|
/bin/
|
||||||
*.exe
|
*.exe
|
||||||
*.dll
|
*.dll
|
||||||
@@ -34,5 +34,5 @@ vendor/
|
|||||||
# Project
|
# Project
|
||||||
data.db
|
data.db
|
||||||
debug.log
|
debug.log
|
||||||
/chat-cli
|
/neoirc-cli
|
||||||
web/node_modules/
|
web/node_modules/
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
1. **Format**: `gofmt -s -w .` and `goimports -w .`
|
1. **Format**: `gofmt -s -w .` and `goimports -w .`
|
||||||
2. **Lint**: `golangci-lint run --config .golangci.yml ./...` — zero issues
|
2. **Lint**: `golangci-lint run --config .golangci.yml ./...` — zero issues
|
||||||
3. **Test**: `go test -race ./...` — all passing
|
3. **Test**: `go test -race ./...` — all passing
|
||||||
4. **Build**: `go build ./cmd/chatd` — compiles clean
|
4. **Build**: `go build ./cmd/neoircd` — compiles clean
|
||||||
|
|
||||||
No commit lands on main with lint errors, test failures, or formatting issues.
|
No commit lands on main with lint errors, test failures, or formatting issues.
|
||||||
|
|
||||||
|
|||||||
33
Dockerfile
33
Dockerfile
@@ -1,32 +1,45 @@
|
|||||||
|
# Lint stage — fast feedback on formatting and lint issues
|
||||||
|
# golangci/golangci-lint:v2.1.6, 2026-03-02
|
||||||
|
FROM golangci/golangci-lint@sha256:568ee1c1c53493575fa9494e280e579ac9ca865787bafe4df3023ae59ecf299b AS lint
|
||||||
|
WORKDIR /src
|
||||||
|
COPY go.mod go.sum ./
|
||||||
|
RUN go mod download
|
||||||
|
COPY . .
|
||||||
|
RUN make fmt-check
|
||||||
|
RUN make lint
|
||||||
|
|
||||||
|
# Build stage
|
||||||
# golang:1.24-alpine, 2026-02-26
|
# golang:1.24-alpine, 2026-02-26
|
||||||
FROM golang@sha256:8bee1901f1e530bfb4a7850aa7a479d17ae3a18beb6e09064ed54cfd245b7191 AS builder
|
FROM golang@sha256:8bee1901f1e530bfb4a7850aa7a479d17ae3a18beb6e09064ed54cfd245b7191 AS builder
|
||||||
WORKDIR /src
|
WORKDIR /src
|
||||||
RUN apk add --no-cache git build-base make
|
RUN apk add --no-cache git build-base make
|
||||||
|
|
||||||
# golangci-lint v2.1.6 (eabc2638a66d), 2026-02-26
|
# Force BuildKit to run the lint stage before proceeding
|
||||||
RUN CGO_ENABLED=0 go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@eabc2638a66daf5bb6c6fb052a32fa3ef7b6600d
|
COPY --from=lint /src/go.sum /dev/null
|
||||||
|
|
||||||
COPY go.mod go.sum ./
|
COPY go.mod go.sum ./
|
||||||
RUN go mod download
|
RUN go mod download
|
||||||
|
|
||||||
COPY . .
|
COPY . .
|
||||||
|
|
||||||
# Run all checks — build fails if branch is not green
|
RUN make test
|
||||||
RUN make check
|
|
||||||
|
|
||||||
# Build static binaries (no cgo needed at runtime — modernc.org/sqlite is pure Go)
|
# Build static binaries (no cgo needed at runtime — modernc.org/sqlite is pure Go)
|
||||||
ARG VERSION=dev
|
ARG VERSION=dev
|
||||||
RUN CGO_ENABLED=0 go build -trimpath -ldflags="-s -w -X main.Version=${VERSION}" -o /chatd ./cmd/chatd/
|
RUN CGO_ENABLED=0 go build -trimpath -ldflags="-s -w -X main.Version=${VERSION}" -o /neoircd ./cmd/neoircd/
|
||||||
RUN CGO_ENABLED=0 go build -trimpath -ldflags="-s -w" -o /chat-cli ./cmd/chat-cli/
|
RUN CGO_ENABLED=0 go build -trimpath -ldflags="-s -w" -o /neoirc-cli ./cmd/neoirc-cli/
|
||||||
|
|
||||||
|
# Runtime stage
|
||||||
# alpine:3.21, 2026-02-26
|
# alpine:3.21, 2026-02-26
|
||||||
FROM alpine@sha256:c3f8e73fdb79deaebaa2037150150191b9dcbfba68b4a46d70103204c53f4709
|
FROM alpine@sha256:c3f8e73fdb79deaebaa2037150150191b9dcbfba68b4a46d70103204c53f4709
|
||||||
RUN apk add --no-cache ca-certificates \
|
RUN apk add --no-cache ca-certificates \
|
||||||
&& addgroup -S chat && adduser -S chat -G chat
|
&& addgroup -S neoirc && adduser -S neoirc -G neoirc \
|
||||||
COPY --from=builder /chatd /usr/local/bin/chatd
|
&& mkdir -p /var/lib/neoirc \
|
||||||
|
&& chown neoirc:neoirc /var/lib/neoirc
|
||||||
|
COPY --from=builder /neoircd /usr/local/bin/neoircd
|
||||||
|
|
||||||
USER chat
|
USER neoirc
|
||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
|
HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
|
||||||
CMD wget -qO- http://localhost:8080/.well-known/healthcheck.json || exit 1
|
CMD wget -qO- http://localhost:8080/.well-known/healthcheck.json || exit 1
|
||||||
ENTRYPOINT ["chatd"]
|
ENTRYPOINT ["neoircd"]
|
||||||
|
|||||||
10
Makefile
10
Makefile
@@ -1,6 +1,6 @@
|
|||||||
.PHONY: all build lint fmt fmt-check test check clean run debug docker hooks
|
.PHONY: all build lint fmt fmt-check test check clean run debug docker hooks
|
||||||
|
|
||||||
BINARY := chatd
|
BINARY := neoircd
|
||||||
VERSION := $(shell git describe --tags --always --dirty 2>/dev/null || echo "dev")
|
VERSION := $(shell git describe --tags --always --dirty 2>/dev/null || echo "dev")
|
||||||
BUILDARCH := $(shell go env GOARCH)
|
BUILDARCH := $(shell go env GOARCH)
|
||||||
LDFLAGS := -X main.Version=$(VERSION) -X main.Buildarch=$(BUILDARCH)
|
LDFLAGS := -X main.Version=$(VERSION) -X main.Buildarch=$(BUILDARCH)
|
||||||
@@ -8,7 +8,7 @@ LDFLAGS := -X main.Version=$(VERSION) -X main.Buildarch=$(BUILDARCH)
|
|||||||
all: check build
|
all: check build
|
||||||
|
|
||||||
build:
|
build:
|
||||||
go build -ldflags "$(LDFLAGS)" -o bin/$(BINARY) ./cmd/chatd
|
go build -ldflags "$(LDFLAGS)" -o bin/$(BINARY) ./cmd/neoircd
|
||||||
|
|
||||||
lint:
|
lint:
|
||||||
golangci-lint run --config .golangci.yml ./...
|
golangci-lint run --config .golangci.yml ./...
|
||||||
@@ -27,7 +27,7 @@ test:
|
|||||||
# Used by CI and Docker build — fails if anything is wrong
|
# Used by CI and Docker build — fails if anything is wrong
|
||||||
check: test lint fmt-check
|
check: test lint fmt-check
|
||||||
@echo "==> Building..."
|
@echo "==> Building..."
|
||||||
go build -ldflags "$(LDFLAGS)" -o /dev/null ./cmd/chatd
|
go build -ldflags "$(LDFLAGS)" -o /dev/null ./cmd/neoircd
|
||||||
@echo "==> All checks passed!"
|
@echo "==> All checks passed!"
|
||||||
|
|
||||||
run: build
|
run: build
|
||||||
@@ -37,10 +37,10 @@ debug: build
|
|||||||
DEBUG=1 GOTRACEBACK=all ./bin/$(BINARY)
|
DEBUG=1 GOTRACEBACK=all ./bin/$(BINARY)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -rf bin/ chatd data.db
|
rm -rf bin/ neoircd
|
||||||
|
|
||||||
docker:
|
docker:
|
||||||
docker build -t chat .
|
docker build -t neoirc .
|
||||||
|
|
||||||
hooks:
|
hooks:
|
||||||
@printf '#!/bin/sh\nset -e\n' > .git/hooks/pre-commit
|
@printf '#!/bin/sh\nset -e\n' > .git/hooks/pre-commit
|
||||||
|
|||||||
146
README.md
146
README.md
@@ -1,9 +1,9 @@
|
|||||||
# chat
|
# neoirc
|
||||||
|
|
||||||
**IRC semantics, structured message metadata, cryptographic signing, and
|
**IRC semantics, structured message metadata, cryptographic signing, and
|
||||||
server-held session state with per-client delivery queues. All over HTTP+JSON.**
|
server-held session state with per-client delivery queues. All over HTTP+JSON.**
|
||||||
|
|
||||||
A chat server written in Go that decouples session state from transport
|
An IRC-inspired server written in Go that decouples session state from transport
|
||||||
connections, enabling mobile-friendly persistent sessions over plain HTTP.
|
connections, enabling mobile-friendly persistent sessions over plain HTTP.
|
||||||
|
|
||||||
The **HTTP API is the primary interface**. It's designed to be simple enough
|
The **HTTP API is the primary interface**. It's designed to be simple enough
|
||||||
@@ -44,7 +44,7 @@ IRC is in decline because session state is tied to the TCP connection. In a
|
|||||||
mobile-first world, that's a nonstarter. Not everyone wants to run a bouncer
|
mobile-first world, that's a nonstarter. Not everyone wants to run a bouncer
|
||||||
or pay for IRCCloud.
|
or pay for IRCCloud.
|
||||||
|
|
||||||
This project builds a chat server that:
|
This project builds a server that:
|
||||||
|
|
||||||
- Holds session state server-side (message queues, presence, channel membership)
|
- Holds session state server-side (message queues, presence, channel membership)
|
||||||
- Exposes a minimal, clean HTTP+JSON API — easy to build clients against
|
- Exposes a minimal, clean HTTP+JSON API — easy to build clients against
|
||||||
@@ -132,7 +132,7 @@ makes signing consistent — you sign the same structure you send.
|
|||||||
|
|
||||||
### Why not XMPP or Matrix?
|
### Why not XMPP or Matrix?
|
||||||
|
|
||||||
XMPP is XML-based, overengineered for chat, and the ecosystem is fragmented
|
XMPP is XML-based, overengineered for messaging, and the ecosystem is fragmented
|
||||||
across incompatible extensions (XEPs). Matrix is a federated append-only event
|
across incompatible extensions (XEPs). Matrix is a federated append-only event
|
||||||
graph with a spec that runs to hundreds of pages. Both are fine protocols, but
|
graph with a spec that runs to hundreds of pages. Both are fine protocols, but
|
||||||
they're solving different problems at different scales.
|
they're solving different problems at different scales.
|
||||||
@@ -828,16 +828,16 @@ the server to the client (never C2S) and use 3-digit string codes in the
|
|||||||
| Code | Name | When Sent | Example |
|
| Code | Name | When Sent | Example |
|
||||||
|------|----------------------|-----------|---------|
|
|------|----------------------|-----------|---------|
|
||||||
| `001` | RPL_WELCOME | After session creation | `{"command":"001","to":"alice","body":["Welcome to the network, alice"]}` |
|
| `001` | RPL_WELCOME | After session creation | `{"command":"001","to":"alice","body":["Welcome to the network, alice"]}` |
|
||||||
| `002` | RPL_YOURHOST | After session creation | `{"command":"002","to":"alice","body":["Your host is chatserver, running version 0.1"]}` |
|
| `002` | RPL_YOURHOST | After session creation | `{"command":"002","to":"alice","body":["Your host is neoirc-server, running version 0.1"]}` |
|
||||||
| `003` | RPL_CREATED | After session creation | `{"command":"003","to":"alice","body":["This server was created 2026-02-10"]}` |
|
| `003` | RPL_CREATED | After session creation | `{"command":"003","to":"alice","body":["This server was created 2026-02-10"]}` |
|
||||||
| `004` | RPL_MYINFO | After session creation | `{"command":"004","to":"alice","params":["chatserver","0.1","","imnst"]}` |
|
| `004` | RPL_MYINFO | After session creation | `{"command":"004","to":"alice","params":["neoirc-server","0.1","","imnst"]}` |
|
||||||
| `322` | RPL_LIST | In response to LIST | `{"command":"322","to":"alice","params":["#general","5"],"body":["General chat"]}` |
|
| `322` | RPL_LIST | In response to LIST | `{"command":"322","to":"alice","params":["#general","5"],"body":["General discussion"]}` |
|
||||||
| `323` | RPL_LISTEND | End of LIST response | `{"command":"323","to":"alice","body":["End of /LIST"]}` |
|
| `323` | RPL_LISTEND | End of LIST response | `{"command":"323","to":"alice","body":["End of /LIST"]}` |
|
||||||
| `332` | RPL_TOPIC | On JOIN or TOPIC query | `{"command":"332","to":"alice","params":["#general"],"body":["Welcome!"]}` |
|
| `332` | RPL_TOPIC | On JOIN or TOPIC query | `{"command":"332","to":"alice","params":["#general"],"body":["Welcome!"]}` |
|
||||||
| `353` | RPL_NAMREPLY | On JOIN or NAMES query | `{"command":"353","to":"alice","params":["=","#general"],"body":["@op1 alice bob +voiced1"]}` |
|
| `353` | RPL_NAMREPLY | On JOIN or NAMES query | `{"command":"353","to":"alice","params":["=","#general"],"body":["@op1 alice bob +voiced1"]}` |
|
||||||
| `366` | RPL_ENDOFNAMES | End of NAMES response | `{"command":"366","to":"alice","params":["#general"],"body":["End of /NAMES list"]}` |
|
| `366` | RPL_ENDOFNAMES | End of NAMES response | `{"command":"366","to":"alice","params":["#general"],"body":["End of /NAMES list"]}` |
|
||||||
| `372` | RPL_MOTD | MOTD line | `{"command":"372","to":"alice","body":["Welcome to the server"]}` |
|
| `372` | RPL_MOTD | MOTD line | `{"command":"372","to":"alice","body":["Welcome to the server"]}` |
|
||||||
| `375` | RPL_MOTDSTART | Start of MOTD | `{"command":"375","to":"alice","body":["- chatserver Message of the Day -"]}` |
|
| `375` | RPL_MOTDSTART | Start of MOTD | `{"command":"375","to":"alice","body":["- neoirc-server Message of the Day -"]}` |
|
||||||
| `376` | RPL_ENDOFMOTD | End of MOTD | `{"command":"376","to":"alice","body":["End of /MOTD command"]}` |
|
| `376` | RPL_ENDOFMOTD | End of MOTD | `{"command":"376","to":"alice","body":["End of /MOTD command"]}` |
|
||||||
| `401` | ERR_NOSUCHNICK | DM to nonexistent nick | `{"command":"401","to":"alice","params":["bob"],"body":["No such nick/channel"]}` |
|
| `401` | ERR_NOSUCHNICK | DM to nonexistent nick | `{"command":"401","to":"alice","params":["bob"],"body":["No such nick/channel"]}` |
|
||||||
| `403` | ERR_NOSUCHCHANNEL | Action on nonexistent channel | `{"command":"403","to":"alice","params":["#nope"],"body":["No such channel"]}` |
|
| `403` | ERR_NOSUCHCHANNEL | Action on nonexistent channel | `{"command":"403","to":"alice","params":["#nope"],"body":["No such channel"]}` |
|
||||||
@@ -1158,6 +1158,55 @@ curl -s http://localhost:8080/api/v1/channels/general/members \
|
|||||||
-H "Authorization: Bearer $TOKEN" | jq .
|
-H "Authorization: Bearer $TOKEN" | jq .
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### POST /api/v1/logout — Logout
|
||||||
|
|
||||||
|
Destroy the current client's auth token. If no other clients remain on the
|
||||||
|
session, the user is fully cleaned up: parted from all channels (with QUIT
|
||||||
|
broadcast to members), session deleted, nick released.
|
||||||
|
|
||||||
|
**Request:** No body. Requires auth.
|
||||||
|
|
||||||
|
**Response:** `200 OK`
|
||||||
|
```json
|
||||||
|
{"status": "ok"}
|
||||||
|
```
|
||||||
|
|
||||||
|
**Errors:**
|
||||||
|
|
||||||
|
| Status | Error | When |
|
||||||
|
|--------|-------|------|
|
||||||
|
| 401 | `unauthorized` | Missing or invalid auth token |
|
||||||
|
|
||||||
|
**curl example:**
|
||||||
|
```bash
|
||||||
|
curl -s -X POST http://localhost:8080/api/v1/logout \
|
||||||
|
-H "Authorization: Bearer $TOKEN" | jq .
|
||||||
|
```
|
||||||
|
|
||||||
|
### GET /api/v1/users/me — Current User Info
|
||||||
|
|
||||||
|
Return the current user's session state. This is an alias for
|
||||||
|
`GET /api/v1/state`.
|
||||||
|
|
||||||
|
**Request:** No body. Requires auth.
|
||||||
|
|
||||||
|
**Response:** `200 OK`
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"id": 1,
|
||||||
|
"nick": "alice",
|
||||||
|
"channels": [
|
||||||
|
{"id": 1, "name": "#general", "topic": "Welcome!"}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**curl example:**
|
||||||
|
```bash
|
||||||
|
curl -s http://localhost:8080/api/v1/users/me \
|
||||||
|
-H "Authorization: Bearer $TOKEN" | jq .
|
||||||
|
```
|
||||||
|
|
||||||
### GET /api/v1/server — Server Info
|
### GET /api/v1/server — Server Info
|
||||||
|
|
||||||
Return server metadata. No authentication required.
|
Return server metadata. No authentication required.
|
||||||
@@ -1165,11 +1214,18 @@ Return server metadata. No authentication required.
|
|||||||
**Response:** `200 OK`
|
**Response:** `200 OK`
|
||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
"name": "My Chat Server",
|
"name": "My NeoIRC Server",
|
||||||
"motd": "Welcome! Be nice."
|
"motd": "Welcome! Be nice.",
|
||||||
|
"users": 42
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
|
| Field | Type | Description |
|
||||||
|
|---------|---------|-------------|
|
||||||
|
| `name` | string | Server display name |
|
||||||
|
| `motd` | string | Message of the day |
|
||||||
|
| `users` | integer | Number of currently active user sessions |
|
||||||
|
|
||||||
### GET /.well-known/healthcheck.json — Health Check
|
### GET /.well-known/healthcheck.json — Health Check
|
||||||
|
|
||||||
Standard health check endpoint. No authentication required.
|
Standard health check endpoint. No authentication required.
|
||||||
@@ -1412,7 +1468,7 @@ authenticity.
|
|||||||
|
|
||||||
## Federation (Server-to-Server)
|
## Federation (Server-to-Server)
|
||||||
|
|
||||||
Federation allows multiple chat servers to link together, forming a network
|
Federation allows multiple neoirc servers to link together, forming a network
|
||||||
where users on different servers can share channels — similar to IRC server
|
where users on different servers can share channels — similar to IRC server
|
||||||
linking.
|
linking.
|
||||||
|
|
||||||
@@ -1572,8 +1628,10 @@ skew issues) and simpler than UUIDs (integer comparison vs. string comparison).
|
|||||||
- **Queue entries**: Stored until pruned. Pruning by `QUEUE_MAX_AGE` is
|
- **Queue entries**: Stored until pruned. Pruning by `QUEUE_MAX_AGE` is
|
||||||
planned.
|
planned.
|
||||||
- **Channels**: Deleted when the last member leaves (ephemeral).
|
- **Channels**: Deleted when the last member leaves (ephemeral).
|
||||||
- **Users/sessions**: Deleted on `QUIT`. Session expiry by `SESSION_TIMEOUT`
|
- **Users/sessions**: Deleted on `QUIT` or `POST /api/v1/logout`. Idle
|
||||||
is planned.
|
sessions are automatically expired after `SESSION_IDLE_TIMEOUT` (default
|
||||||
|
24h) — the server runs a background cleanup loop that parts idle users
|
||||||
|
from all channels, broadcasts QUIT, and releases their nicks.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -1587,10 +1645,10 @@ directory is also loaded automatically via
|
|||||||
| Variable | Type | Default | Description |
|
| Variable | Type | Default | Description |
|
||||||
|--------------------|---------|--------------------------------------|-------------|
|
|--------------------|---------|--------------------------------------|-------------|
|
||||||
| `PORT` | int | `8080` | HTTP listen port |
|
| `PORT` | int | `8080` | HTTP listen port |
|
||||||
| `DBURL` | string | `file:./data.db?_journal_mode=WAL` | SQLite connection string. For file-based: `file:./path.db?_journal_mode=WAL`. For in-memory (testing): `file::memory:?cache=shared`. |
|
| `DBURL` | string | `file:///var/lib/neoirc/state.db?_journal_mode=WAL` | SQLite connection string. For file-based: `file:///path/to/db.db?_journal_mode=WAL`. For in-memory (testing): `file::memory:?cache=shared`. |
|
||||||
| `DEBUG` | bool | `false` | Enable debug logging (verbose request/response logging) |
|
| `DEBUG` | bool | `false` | Enable debug logging (verbose request/response logging) |
|
||||||
| `MAX_HISTORY` | int | `10000` | Maximum messages retained per channel before rotation (planned) |
|
| `MAX_HISTORY` | int | `10000` | Maximum messages retained per channel before rotation (planned) |
|
||||||
| `SESSION_TIMEOUT` | int | `86400` | Session idle timeout in seconds (planned). Sessions with no activity for this long are expired and the nick is released. |
|
| `SESSION_IDLE_TIMEOUT` | string | `24h` | Session idle timeout as a Go duration string (e.g. `24h`, `30m`). Sessions with no activity for this long are expired and the nick is released. |
|
||||||
| `QUEUE_MAX_AGE` | int | `172800` | Maximum age of client queue entries in seconds (48h). Entries older than this are pruned (planned). |
|
| `QUEUE_MAX_AGE` | int | `172800` | Maximum age of client queue entries in seconds (48h). Entries older than this are pruned (planned). |
|
||||||
| `MAX_MESSAGE_SIZE` | int | `4096` | Maximum message body size in bytes (planned enforcement) |
|
| `MAX_MESSAGE_SIZE` | int | `4096` | Maximum message body size in bytes (planned enforcement) |
|
||||||
| `LONG_POLL_TIMEOUT`| int | `15` | Default long-poll timeout in seconds (client can override via query param, server caps at 30) |
|
| `LONG_POLL_TIMEOUT`| int | `15` | Default long-poll timeout in seconds (client can override via query param, server caps at 30) |
|
||||||
@@ -1606,11 +1664,11 @@ directory is also loaded automatically via
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
PORT=8080
|
PORT=8080
|
||||||
SERVER_NAME=My Chat Server
|
SERVER_NAME=My NeoIRC Server
|
||||||
MOTD=Welcome! Be excellent to each other.
|
MOTD=Welcome! Be excellent to each other.
|
||||||
DEBUG=false
|
DEBUG=false
|
||||||
DBURL=file:./data.db?_journal_mode=WAL
|
DBURL=file:///var/lib/neoirc/state.db?_journal_mode=WAL
|
||||||
SESSION_TIMEOUT=86400
|
SESSION_IDLE_TIMEOUT=24h
|
||||||
```
|
```
|
||||||
|
|
||||||
---
|
---
|
||||||
@@ -1619,25 +1677,24 @@ SESSION_TIMEOUT=86400
|
|||||||
|
|
||||||
### Docker (Recommended)
|
### Docker (Recommended)
|
||||||
|
|
||||||
The Docker image contains a single static binary (`chatd`) and nothing else.
|
The Docker image contains a single static binary (`neoircd`) and nothing else.
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Build
|
# Build
|
||||||
docker build -t chat .
|
docker build -t neoirc .
|
||||||
|
|
||||||
# Run
|
# Run
|
||||||
docker run -p 8080:8080 \
|
docker run -p 8080:8080 \
|
||||||
-v chat-data:/data \
|
-v neoirc-data:/var/lib/neoirc \
|
||||||
-e DBURL="file:/data/chat.db?_journal_mode=WAL" \
|
|
||||||
-e SERVER_NAME="My Server" \
|
-e SERVER_NAME="My Server" \
|
||||||
-e MOTD="Welcome!" \
|
-e MOTD="Welcome!" \
|
||||||
chat
|
neoirc
|
||||||
```
|
```
|
||||||
|
|
||||||
The Dockerfile is a multi-stage build:
|
The Dockerfile is a multi-stage build:
|
||||||
1. **Build stage**: Compiles `chatd` and `chat-cli` (CLI built to verify
|
1. **Build stage**: Compiles `neoircd` and `neoirc-cli` (CLI built to verify
|
||||||
compilation, not included in final image)
|
compilation, not included in final image)
|
||||||
2. **Final stage**: Alpine Linux + `chatd` binary only
|
2. **Final stage**: Alpine Linux + `neoircd` binary only
|
||||||
|
|
||||||
```dockerfile
|
```dockerfile
|
||||||
FROM golang:1.24-alpine AS builder
|
FROM golang:1.24-alpine AS builder
|
||||||
@@ -1646,13 +1703,13 @@ RUN apk add --no-cache make
|
|||||||
COPY go.mod go.sum ./
|
COPY go.mod go.sum ./
|
||||||
RUN go mod download
|
RUN go mod download
|
||||||
COPY . .
|
COPY . .
|
||||||
RUN go build -o /chatd ./cmd/chatd/
|
RUN go build -o /neoircd ./cmd/neoircd/
|
||||||
RUN go build -o /chat-cli ./cmd/chat-cli/
|
RUN go build -o /neoirc-cli ./cmd/neoirc-cli/
|
||||||
|
|
||||||
FROM alpine:latest
|
FROM alpine:latest
|
||||||
COPY --from=builder /chatd /usr/local/bin/chatd
|
COPY --from=builder /neoircd /usr/local/bin/neoircd
|
||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
CMD ["chatd"]
|
CMD ["neoircd"]
|
||||||
```
|
```
|
||||||
|
|
||||||
### Binary
|
### Binary
|
||||||
@@ -1660,11 +1717,11 @@ CMD ["chatd"]
|
|||||||
```bash
|
```bash
|
||||||
# Build from source
|
# Build from source
|
||||||
make build
|
make build
|
||||||
# Binary at ./bin/chatd
|
# Binary at ./bin/neoircd
|
||||||
|
|
||||||
# Run
|
# Run
|
||||||
./bin/chatd
|
./bin/neoircd
|
||||||
# Listens on :8080, creates ./data.db
|
# Listens on :8080, writes to /var/lib/neoirc/state.db
|
||||||
```
|
```
|
||||||
|
|
||||||
### Reverse Proxy (Production)
|
### Reverse Proxy (Production)
|
||||||
@@ -1673,7 +1730,7 @@ For production, run behind a TLS-terminating reverse proxy.
|
|||||||
|
|
||||||
**Caddy:**
|
**Caddy:**
|
||||||
```
|
```
|
||||||
chat.example.com {
|
neoirc.example.com {
|
||||||
reverse_proxy localhost:8080
|
reverse_proxy localhost:8080
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
@@ -1682,7 +1739,7 @@ chat.example.com {
|
|||||||
```nginx
|
```nginx
|
||||||
server {
|
server {
|
||||||
listen 443 ssl;
|
listen 443 ssl;
|
||||||
server_name chat.example.com;
|
server_name neoirc.example.com;
|
||||||
|
|
||||||
ssl_certificate /path/to/cert.pem;
|
ssl_certificate /path/to/cert.pem;
|
||||||
ssl_certificate_key /path/to/key.pem;
|
ssl_certificate_key /path/to/key.pem;
|
||||||
@@ -1705,15 +1762,15 @@ seconds to accommodate long-poll connections.
|
|||||||
string). This allows concurrent reads during writes.
|
string). This allows concurrent reads during writes.
|
||||||
- **Single writer**: SQLite allows only one writer at a time. For high-traffic
|
- **Single writer**: SQLite allows only one writer at a time. For high-traffic
|
||||||
servers, Postgres support is planned.
|
servers, Postgres support is planned.
|
||||||
- **Backup**: The database is a single file. Back it up with `sqlite3 data.db ".backup backup.db"` or just copy the file (safe with WAL mode).
|
- **Backup**: The database is a single file. Back it up with `sqlite3 /var/lib/neoirc/state.db ".backup backup.db"` or just copy the file (safe with WAL mode).
|
||||||
- **Location**: By default, `data.db` is created in the working directory.
|
- **Location**: By default, `state.db` is created in `/var/lib/neoirc/`.
|
||||||
Use the `DBURL` env var to place it elsewhere.
|
Use the `DBURL` env var to place it elsewhere.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## Client Development Guide
|
## Client Development Guide
|
||||||
|
|
||||||
This section explains how to write a client against the chat API. The API is
|
This section explains how to write a client against the neoirc API. The API is
|
||||||
designed to be simple enough that a basic client can be written in any language
|
designed to be simple enough that a basic client can be written in any language
|
||||||
with an HTTP client library.
|
with an HTTP client library.
|
||||||
|
|
||||||
@@ -2003,16 +2060,19 @@ GET /api/v1/challenge
|
|||||||
- [x] NICK change with broadcast
|
- [x] NICK change with broadcast
|
||||||
- [x] QUIT with broadcast and cleanup
|
- [x] QUIT with broadcast and cleanup
|
||||||
- [x] Embedded web SPA client
|
- [x] Embedded web SPA client
|
||||||
- [x] CLI client (chat-cli)
|
- [x] CLI client (neoirc-cli)
|
||||||
- [x] SQLite storage with WAL mode
|
- [x] SQLite storage with WAL mode
|
||||||
- [x] Docker deployment
|
- [x] Docker deployment
|
||||||
- [x] Prometheus metrics endpoint
|
- [x] Prometheus metrics endpoint
|
||||||
- [x] Health check endpoint
|
- [x] Health check endpoint
|
||||||
|
- [x] Session expiry — auto-expire idle sessions, release nicks
|
||||||
|
- [x] Logout endpoint (`POST /api/v1/logout`)
|
||||||
|
- [x] Current user endpoint (`GET /api/v1/users/me`)
|
||||||
|
- [x] User count in server info (`GET /api/v1/server`)
|
||||||
|
|
||||||
### Post-MVP (Planned)
|
### Post-MVP (Planned)
|
||||||
|
|
||||||
- [ ] **Hashcash proof-of-work** for session creation (abuse prevention)
|
- [ ] **Hashcash proof-of-work** for session creation (abuse prevention)
|
||||||
- [ ] **Session expiry** — auto-expire idle sessions, release nicks
|
|
||||||
- [ ] **Queue pruning** — delete old queue entries per `QUEUE_MAX_AGE`
|
- [ ] **Queue pruning** — delete old queue entries per `QUEUE_MAX_AGE`
|
||||||
- [ ] **Message rotation** — enforce `MAX_HISTORY` per channel
|
- [ ] **Message rotation** — enforce `MAX_HISTORY` per channel
|
||||||
- [ ] **Channel modes** — enforce `+i`, `+m`, `+s`, `+t`, `+n`
|
- [ ] **Channel modes** — enforce `+i`, `+m`, `+s`, `+t`, `+n`
|
||||||
@@ -2053,11 +2113,11 @@ GET /api/v1/challenge
|
|||||||
Following [gohttpserver CONVENTIONS.md](https://git.eeqj.de/sneak/gohttpserver/src/branch/main/CONVENTIONS.md):
|
Following [gohttpserver CONVENTIONS.md](https://git.eeqj.de/sneak/gohttpserver/src/branch/main/CONVENTIONS.md):
|
||||||
|
|
||||||
```
|
```
|
||||||
chat/
|
neoirc/
|
||||||
├── cmd/
|
├── cmd/
|
||||||
│ ├── chatd/ # Server binary entry point
|
│ ├── neoircd/ # Server binary entry point
|
||||||
│ │ └── main.go
|
│ │ └── main.go
|
||||||
│ └── chat-cli/ # TUI client
|
│ └── neoirc-cli/ # TUI client
|
||||||
│ ├── main.go # Command handling, poll loop
|
│ ├── main.go # Command handling, poll loop
|
||||||
│ ├── ui.go # tview-based terminal UI
|
│ ├── ui.go # tview-based terminal UI
|
||||||
│ └── api/
|
│ └── api/
|
||||||
@@ -2188,7 +2248,7 @@ chat/
|
|||||||
- IRC message envelope format with per-client queue fan-out
|
- IRC message envelope format with per-client queue fan-out
|
||||||
- Long-polling with in-memory broker
|
- Long-polling with in-memory broker
|
||||||
- Embedded web SPA client
|
- Embedded web SPA client
|
||||||
- TUI client (chat-cli)
|
- TUI client (neoirc-cli)
|
||||||
- Docker image
|
- Docker image
|
||||||
- Prometheus metrics
|
- Prometheus metrics
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
// Package chatapi provides a client for the chat server API.
|
// Package neoircapi provides a client for the neoirc server API.
|
||||||
package chatapi
|
package neoircapi
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
@@ -23,7 +23,7 @@ const (
|
|||||||
|
|
||||||
var errHTTP = errors.New("HTTP error")
|
var errHTTP = errors.New("HTTP error")
|
||||||
|
|
||||||
// Client wraps HTTP calls to the chat server API.
|
// Client wraps HTTP calls to the neoirc server API.
|
||||||
type Client struct {
|
type Client struct {
|
||||||
BaseURL string
|
BaseURL string
|
||||||
Token string
|
Token string
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package chatapi
|
package neoircapi
|
||||||
|
|
||||||
import "time"
|
import "time"
|
||||||
|
|
||||||
@@ -21,7 +21,7 @@ type StateResponse struct {
|
|||||||
Channels []string `json:"channels"`
|
Channels []string `json:"channels"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Message represents a chat message envelope.
|
// Message represents a neoirc message envelope.
|
||||||
type Message struct {
|
type Message struct {
|
||||||
Command string `json:"command"`
|
Command string `json:"command"`
|
||||||
From string `json:"from,omitempty"`
|
From string `json:"from,omitempty"`
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
// Package main is the entry point for the chat-cli client.
|
// Package main is the entry point for the neoirc-cli client.
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -8,7 +8,7 @@ import (
|
|||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
api "git.eeqj.de/sneak/chat/cmd/chat-cli/api"
|
api "git.eeqj.de/sneak/neoirc/cmd/neoirc-cli/api"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@@ -41,7 +41,7 @@ func main() {
|
|||||||
app.ui.SetStatus(app.nick, "", "disconnected")
|
app.ui.SetStatus(app.nick, "", "disconnected")
|
||||||
|
|
||||||
app.ui.AddStatus(
|
app.ui.AddStatus(
|
||||||
"Welcome to chat-cli — an IRC-style client",
|
"Welcome to neoirc-cli — an IRC-style client",
|
||||||
)
|
)
|
||||||
app.ui.AddStatus(
|
app.ui.AddStatus(
|
||||||
"Type [yellow]/connect <server-url>" +
|
"Type [yellow]/connect <server-url>" +
|
||||||
@@ -564,7 +564,7 @@ func (a *App) cmdQuit() {
|
|||||||
|
|
||||||
func (a *App) cmdHelp() {
|
func (a *App) cmdHelp() {
|
||||||
help := []string{
|
help := []string{
|
||||||
"[cyan]*** chat-cli commands:",
|
"[cyan]*** neoirc-cli commands:",
|
||||||
" /connect <url> — Connect to server",
|
" /connect <url> — Connect to server",
|
||||||
" /nick <name> — Change nickname",
|
" /nick <name> — Change nickname",
|
||||||
" /join #channel — Join channel",
|
" /join #channel — Join channel",
|
||||||
@@ -1,21 +1,21 @@
|
|||||||
// Package main is the entry point for the chatd server.
|
// Package main is the entry point for the neoircd server.
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"git.eeqj.de/sneak/chat/internal/config"
|
"git.eeqj.de/sneak/neoirc/internal/config"
|
||||||
"git.eeqj.de/sneak/chat/internal/db"
|
"git.eeqj.de/sneak/neoirc/internal/db"
|
||||||
"git.eeqj.de/sneak/chat/internal/globals"
|
"git.eeqj.de/sneak/neoirc/internal/globals"
|
||||||
"git.eeqj.de/sneak/chat/internal/handlers"
|
"git.eeqj.de/sneak/neoirc/internal/handlers"
|
||||||
"git.eeqj.de/sneak/chat/internal/healthcheck"
|
"git.eeqj.de/sneak/neoirc/internal/healthcheck"
|
||||||
"git.eeqj.de/sneak/chat/internal/logger"
|
"git.eeqj.de/sneak/neoirc/internal/logger"
|
||||||
"git.eeqj.de/sneak/chat/internal/middleware"
|
"git.eeqj.de/sneak/neoirc/internal/middleware"
|
||||||
"git.eeqj.de/sneak/chat/internal/server"
|
"git.eeqj.de/sneak/neoirc/internal/server"
|
||||||
"go.uber.org/fx"
|
"go.uber.org/fx"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
// Appname is the application name, set at build time.
|
// Appname is the application name, set at build time.
|
||||||
Appname = "chat" //nolint:gochecknoglobals
|
Appname = "neoirc" //nolint:gochecknoglobals
|
||||||
|
|
||||||
// Version is the application version, set at build time.
|
// Version is the application version, set at build time.
|
||||||
Version string //nolint:gochecknoglobals
|
Version string //nolint:gochecknoglobals
|
||||||
2
go.mod
2
go.mod
@@ -1,4 +1,4 @@
|
|||||||
module git.eeqj.de/sneak/chat
|
module git.eeqj.de/sneak/neoirc
|
||||||
|
|
||||||
go 1.24.0
|
go 1.24.0
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.eeqj.de/sneak/chat/internal/broker"
|
"git.eeqj.de/sneak/neoirc/internal/broker"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestNewBroker(t *testing.T) {
|
func TestNewBroker(t *testing.T) {
|
||||||
|
|||||||
@@ -5,8 +5,8 @@ import (
|
|||||||
"errors"
|
"errors"
|
||||||
"log/slog"
|
"log/slog"
|
||||||
|
|
||||||
"git.eeqj.de/sneak/chat/internal/globals"
|
"git.eeqj.de/sneak/neoirc/internal/globals"
|
||||||
"git.eeqj.de/sneak/chat/internal/logger"
|
"git.eeqj.de/sneak/neoirc/internal/logger"
|
||||||
"github.com/spf13/viper"
|
"github.com/spf13/viper"
|
||||||
"go.uber.org/fx"
|
"go.uber.org/fx"
|
||||||
|
|
||||||
@@ -23,21 +23,21 @@ type Params struct {
|
|||||||
|
|
||||||
// Config holds all application configuration values.
|
// Config holds all application configuration values.
|
||||||
type Config struct {
|
type Config struct {
|
||||||
DBURL string
|
DBURL string
|
||||||
Debug bool
|
Debug bool
|
||||||
MaintenanceMode bool
|
MaintenanceMode bool
|
||||||
MetricsPassword string
|
MetricsPassword string
|
||||||
MetricsUsername string
|
MetricsUsername string
|
||||||
Port int
|
Port int
|
||||||
SentryDSN string
|
SentryDSN string
|
||||||
MaxHistory int
|
MaxHistory int
|
||||||
SessionTimeout int
|
MaxMessageSize int
|
||||||
MaxMessageSize int
|
MOTD string
|
||||||
MOTD string
|
ServerName string
|
||||||
ServerName string
|
FederationKey string
|
||||||
FederationKey string
|
SessionIdleTimeout string
|
||||||
params *Params
|
params *Params
|
||||||
log *slog.Logger
|
log *slog.Logger
|
||||||
}
|
}
|
||||||
|
|
||||||
// New creates a new Config by reading from files and environment variables.
|
// New creates a new Config by reading from files and environment variables.
|
||||||
@@ -56,16 +56,16 @@ func New(
|
|||||||
viper.SetDefault("DEBUG", "false")
|
viper.SetDefault("DEBUG", "false")
|
||||||
viper.SetDefault("MAINTENANCE_MODE", "false")
|
viper.SetDefault("MAINTENANCE_MODE", "false")
|
||||||
viper.SetDefault("PORT", "8080")
|
viper.SetDefault("PORT", "8080")
|
||||||
viper.SetDefault("DBURL", "file:./data.db?_journal_mode=WAL")
|
viper.SetDefault("DBURL", "file:///var/lib/neoirc/state.db?_journal_mode=WAL")
|
||||||
viper.SetDefault("SENTRY_DSN", "")
|
viper.SetDefault("SENTRY_DSN", "")
|
||||||
viper.SetDefault("METRICS_USERNAME", "")
|
viper.SetDefault("METRICS_USERNAME", "")
|
||||||
viper.SetDefault("METRICS_PASSWORD", "")
|
viper.SetDefault("METRICS_PASSWORD", "")
|
||||||
viper.SetDefault("MAX_HISTORY", "10000")
|
viper.SetDefault("MAX_HISTORY", "10000")
|
||||||
viper.SetDefault("SESSION_TIMEOUT", "86400")
|
|
||||||
viper.SetDefault("MAX_MESSAGE_SIZE", "4096")
|
viper.SetDefault("MAX_MESSAGE_SIZE", "4096")
|
||||||
viper.SetDefault("MOTD", "")
|
viper.SetDefault("MOTD", "")
|
||||||
viper.SetDefault("SERVER_NAME", "")
|
viper.SetDefault("SERVER_NAME", "")
|
||||||
viper.SetDefault("FEDERATION_KEY", "")
|
viper.SetDefault("FEDERATION_KEY", "")
|
||||||
|
viper.SetDefault("SESSION_IDLE_TIMEOUT", "24h")
|
||||||
|
|
||||||
err := viper.ReadInConfig()
|
err := viper.ReadInConfig()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -77,21 +77,21 @@ func New(
|
|||||||
}
|
}
|
||||||
|
|
||||||
cfg := &Config{
|
cfg := &Config{
|
||||||
DBURL: viper.GetString("DBURL"),
|
DBURL: viper.GetString("DBURL"),
|
||||||
Debug: viper.GetBool("DEBUG"),
|
Debug: viper.GetBool("DEBUG"),
|
||||||
Port: viper.GetInt("PORT"),
|
Port: viper.GetInt("PORT"),
|
||||||
SentryDSN: viper.GetString("SENTRY_DSN"),
|
SentryDSN: viper.GetString("SENTRY_DSN"),
|
||||||
MaintenanceMode: viper.GetBool("MAINTENANCE_MODE"),
|
MaintenanceMode: viper.GetBool("MAINTENANCE_MODE"),
|
||||||
MetricsUsername: viper.GetString("METRICS_USERNAME"),
|
MetricsUsername: viper.GetString("METRICS_USERNAME"),
|
||||||
MetricsPassword: viper.GetString("METRICS_PASSWORD"),
|
MetricsPassword: viper.GetString("METRICS_PASSWORD"),
|
||||||
MaxHistory: viper.GetInt("MAX_HISTORY"),
|
MaxHistory: viper.GetInt("MAX_HISTORY"),
|
||||||
SessionTimeout: viper.GetInt("SESSION_TIMEOUT"),
|
MaxMessageSize: viper.GetInt("MAX_MESSAGE_SIZE"),
|
||||||
MaxMessageSize: viper.GetInt("MAX_MESSAGE_SIZE"),
|
MOTD: viper.GetString("MOTD"),
|
||||||
MOTD: viper.GetString("MOTD"),
|
ServerName: viper.GetString("SERVER_NAME"),
|
||||||
ServerName: viper.GetString("SERVER_NAME"),
|
FederationKey: viper.GetString("FEDERATION_KEY"),
|
||||||
FederationKey: viper.GetString("FEDERATION_KEY"),
|
SessionIdleTimeout: viper.GetString("SESSION_IDLE_TIMEOUT"),
|
||||||
log: log,
|
log: log,
|
||||||
params: ¶ms,
|
params: ¶ms,
|
||||||
}
|
}
|
||||||
|
|
||||||
if cfg.Debug {
|
if cfg.Debug {
|
||||||
|
|||||||
@@ -12,8 +12,8 @@ import (
|
|||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"git.eeqj.de/sneak/chat/internal/config"
|
"git.eeqj.de/sneak/neoirc/internal/config"
|
||||||
"git.eeqj.de/sneak/chat/internal/logger"
|
"git.eeqj.de/sneak/neoirc/internal/logger"
|
||||||
"go.uber.org/fx"
|
"go.uber.org/fx"
|
||||||
|
|
||||||
_ "github.com/joho/godotenv/autoload" // .env
|
_ "github.com/joho/godotenv/autoload" // .env
|
||||||
@@ -87,7 +87,7 @@ func (database *Database) GetDB() *sql.DB {
|
|||||||
func (database *Database) connect(ctx context.Context) error {
|
func (database *Database) connect(ctx context.Context) error {
|
||||||
dbURL := database.params.Config.DBURL
|
dbURL := database.params.Config.DBURL
|
||||||
if dbURL == "" {
|
if dbURL == "" {
|
||||||
dbURL = "file:./data.db?_journal_mode=WAL&_busy_timeout=5000"
|
dbURL = "file:///var/lib/neoirc/state.db?_journal_mode=WAL&_busy_timeout=5000"
|
||||||
}
|
}
|
||||||
|
|
||||||
database.log.Info(
|
database.log.Info(
|
||||||
|
|||||||
@@ -779,6 +779,150 @@ func (database *Database) DeleteSession(
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// DeleteClient removes a single client record by ID.
|
||||||
|
func (database *Database) DeleteClient(
|
||||||
|
ctx context.Context,
|
||||||
|
clientID int64,
|
||||||
|
) error {
|
||||||
|
_, err := database.conn.ExecContext(
|
||||||
|
ctx,
|
||||||
|
"DELETE FROM clients WHERE id = ?",
|
||||||
|
clientID,
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("delete client: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetUserCount returns the number of active users.
|
||||||
|
func (database *Database) GetUserCount(
|
||||||
|
ctx context.Context,
|
||||||
|
) (int64, error) {
|
||||||
|
var count int64
|
||||||
|
|
||||||
|
err := database.conn.QueryRowContext(
|
||||||
|
ctx,
|
||||||
|
"SELECT COUNT(*) FROM sessions",
|
||||||
|
).Scan(&count)
|
||||||
|
if err != nil {
|
||||||
|
return 0, fmt.Errorf(
|
||||||
|
"get user count: %w", err,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
return count, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// ClientCountForSession returns the number of clients
|
||||||
|
// belonging to a session.
|
||||||
|
func (database *Database) ClientCountForSession(
|
||||||
|
ctx context.Context,
|
||||||
|
sessionID int64,
|
||||||
|
) (int64, error) {
|
||||||
|
var count int64
|
||||||
|
|
||||||
|
err := database.conn.QueryRowContext(
|
||||||
|
ctx,
|
||||||
|
`SELECT COUNT(*) FROM clients
|
||||||
|
WHERE session_id = ?`,
|
||||||
|
sessionID,
|
||||||
|
).Scan(&count)
|
||||||
|
if err != nil {
|
||||||
|
return 0, fmt.Errorf(
|
||||||
|
"client count for session: %w", err,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
return count, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// DeleteStaleUsers removes clients not seen since the
|
||||||
|
// cutoff and cleans up orphaned users (sessions).
|
||||||
|
func (database *Database) DeleteStaleUsers(
|
||||||
|
ctx context.Context,
|
||||||
|
cutoff time.Time,
|
||||||
|
) (int64, error) {
|
||||||
|
res, err := database.conn.ExecContext(ctx,
|
||||||
|
"DELETE FROM clients WHERE last_seen < ?",
|
||||||
|
cutoff,
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
return 0, fmt.Errorf(
|
||||||
|
"delete stale clients: %w", err,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
deleted, _ := res.RowsAffected()
|
||||||
|
|
||||||
|
_, err = database.conn.ExecContext(ctx,
|
||||||
|
`DELETE FROM sessions WHERE id NOT IN
|
||||||
|
(SELECT DISTINCT session_id FROM clients)`,
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
return deleted, fmt.Errorf(
|
||||||
|
"delete orphan sessions: %w", err,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
return deleted, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// StaleSession holds the id and nick of a session
|
||||||
|
// whose clients are all stale.
|
||||||
|
type StaleSession struct {
|
||||||
|
ID int64
|
||||||
|
Nick string
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetStaleOrphanSessions returns sessions where every
|
||||||
|
// client has a last_seen before cutoff.
|
||||||
|
func (database *Database) GetStaleOrphanSessions(
|
||||||
|
ctx context.Context,
|
||||||
|
cutoff time.Time,
|
||||||
|
) ([]StaleSession, error) {
|
||||||
|
rows, err := database.conn.QueryContext(ctx,
|
||||||
|
`SELECT s.id, s.nick
|
||||||
|
FROM sessions s
|
||||||
|
WHERE s.id IN (
|
||||||
|
SELECT DISTINCT session_id FROM clients
|
||||||
|
WHERE last_seen < ?
|
||||||
|
)
|
||||||
|
AND s.id NOT IN (
|
||||||
|
SELECT DISTINCT session_id FROM clients
|
||||||
|
WHERE last_seen >= ?
|
||||||
|
)`, cutoff, cutoff)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf(
|
||||||
|
"get stale orphan sessions: %w", err,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
defer func() { _ = rows.Close() }()
|
||||||
|
|
||||||
|
var result []StaleSession
|
||||||
|
|
||||||
|
for rows.Next() {
|
||||||
|
var stale StaleSession
|
||||||
|
if err := rows.Scan(&stale.ID, &stale.Nick); err != nil {
|
||||||
|
return nil, fmt.Errorf(
|
||||||
|
"scan stale session: %w", err,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
result = append(result, stale)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := rows.Err(); err != nil {
|
||||||
|
return nil, fmt.Errorf(
|
||||||
|
"iterate stale sessions: %w", err,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
|
||||||
// GetSessionChannels returns channels a session
|
// GetSessionChannels returns channels a session
|
||||||
// belongs to.
|
// belongs to.
|
||||||
func (database *Database) GetSessionChannels(
|
func (database *Database) GetSessionChannels(
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import (
|
|||||||
"encoding/json"
|
"encoding/json"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"git.eeqj.de/sneak/chat/internal/db"
|
"git.eeqj.de/sneak/neoirc/internal/db"
|
||||||
|
|
||||||
_ "modernc.org/sqlite"
|
_ "modernc.org/sqlite"
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -229,7 +229,7 @@ func (hdlr *Handlers) deliverMOTD(
|
|||||||
serverName := hdlr.params.Config.ServerName
|
serverName := hdlr.params.Config.ServerName
|
||||||
|
|
||||||
if serverName == "" {
|
if serverName == "" {
|
||||||
serverName = "chat"
|
serverName = "neoirc"
|
||||||
}
|
}
|
||||||
|
|
||||||
if motd == "" {
|
if motd == "" {
|
||||||
@@ -1361,20 +1361,139 @@ func (hdlr *Handlers) canAccessChannelHistory(
|
|||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
// HandleServerInfo returns server metadata.
|
// HandleLogout deletes the authenticated client's token
|
||||||
func (hdlr *Handlers) HandleServerInfo() http.HandlerFunc {
|
// and cleans up the user (session) if no clients remain.
|
||||||
type infoResponse struct {
|
func (hdlr *Handlers) HandleLogout() http.HandlerFunc {
|
||||||
Name string `json:"name"`
|
|
||||||
MOTD string `json:"motd"`
|
|
||||||
}
|
|
||||||
|
|
||||||
return func(
|
return func(
|
||||||
writer http.ResponseWriter,
|
writer http.ResponseWriter,
|
||||||
request *http.Request,
|
request *http.Request,
|
||||||
) {
|
) {
|
||||||
hdlr.respondJSON(writer, request, &infoResponse{
|
sessionID, clientID, nick, ok :=
|
||||||
Name: hdlr.params.Config.ServerName,
|
hdlr.requireAuth(writer, request)
|
||||||
MOTD: hdlr.params.Config.MOTD,
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx := request.Context()
|
||||||
|
|
||||||
|
err := hdlr.params.Database.DeleteClient(
|
||||||
|
ctx, clientID,
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
hdlr.log.Error(
|
||||||
|
"delete client failed", "error", err,
|
||||||
|
)
|
||||||
|
hdlr.respondError(
|
||||||
|
writer, request,
|
||||||
|
"internal error",
|
||||||
|
http.StatusInternalServerError,
|
||||||
|
)
|
||||||
|
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// If no clients remain, clean up the user fully:
|
||||||
|
// part all channels (notifying members) and
|
||||||
|
// delete the session.
|
||||||
|
remaining, err := hdlr.params.Database.
|
||||||
|
ClientCountForSession(ctx, sessionID)
|
||||||
|
if err != nil {
|
||||||
|
hdlr.log.Error(
|
||||||
|
"client count check failed", "error", err,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
if remaining == 0 {
|
||||||
|
hdlr.cleanupUser(
|
||||||
|
ctx, sessionID, nick,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
hdlr.respondJSON(writer, request,
|
||||||
|
map[string]string{"status": "ok"},
|
||||||
|
http.StatusOK)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// cleanupUser parts the user from all channels (notifying
|
||||||
|
// members) and deletes the session.
|
||||||
|
func (hdlr *Handlers) cleanupUser(
|
||||||
|
ctx context.Context,
|
||||||
|
sessionID int64,
|
||||||
|
nick string,
|
||||||
|
) {
|
||||||
|
channels, _ := hdlr.params.Database.
|
||||||
|
GetSessionChannels(ctx, sessionID)
|
||||||
|
|
||||||
|
notified := map[int64]bool{}
|
||||||
|
|
||||||
|
var quitDBID int64
|
||||||
|
|
||||||
|
if len(channels) > 0 {
|
||||||
|
quitDBID, _, _ = hdlr.params.Database.InsertMessage(
|
||||||
|
ctx, "QUIT", nick, "", nil, nil,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, chanInfo := range channels {
|
||||||
|
memberIDs, _ := hdlr.params.Database.
|
||||||
|
GetChannelMemberIDs(ctx, chanInfo.ID)
|
||||||
|
|
||||||
|
for _, mid := range memberIDs {
|
||||||
|
if mid != sessionID && !notified[mid] {
|
||||||
|
notified[mid] = true
|
||||||
|
|
||||||
|
_ = hdlr.params.Database.EnqueueToSession(
|
||||||
|
ctx, mid, quitDBID,
|
||||||
|
)
|
||||||
|
|
||||||
|
hdlr.broker.Notify(mid)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
_ = hdlr.params.Database.PartChannel(
|
||||||
|
ctx, chanInfo.ID, sessionID,
|
||||||
|
)
|
||||||
|
|
||||||
|
_ = hdlr.params.Database.DeleteChannelIfEmpty(
|
||||||
|
ctx, chanInfo.ID,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
_ = hdlr.params.Database.DeleteSession(ctx, sessionID)
|
||||||
|
}
|
||||||
|
|
||||||
|
// HandleUsersMe returns the current user's session info.
|
||||||
|
func (hdlr *Handlers) HandleUsersMe() http.HandlerFunc {
|
||||||
|
return hdlr.HandleState()
|
||||||
|
}
|
||||||
|
|
||||||
|
// HandleServerInfo returns server metadata.
|
||||||
|
func (hdlr *Handlers) HandleServerInfo() http.HandlerFunc {
|
||||||
|
return func(
|
||||||
|
writer http.ResponseWriter,
|
||||||
|
request *http.Request,
|
||||||
|
) {
|
||||||
|
users, err := hdlr.params.Database.GetUserCount(
|
||||||
|
request.Context(),
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
hdlr.log.Error(
|
||||||
|
"get user count failed", "error", err,
|
||||||
|
)
|
||||||
|
hdlr.respondError(
|
||||||
|
writer, request,
|
||||||
|
"internal error",
|
||||||
|
http.StatusInternalServerError,
|
||||||
|
)
|
||||||
|
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
hdlr.respondJSON(writer, request, map[string]any{
|
||||||
|
"name": hdlr.params.Config.ServerName,
|
||||||
|
"motd": hdlr.params.Config.MOTD,
|
||||||
|
"users": users,
|
||||||
}, http.StatusOK)
|
}, http.StatusOK)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,14 +17,14 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.eeqj.de/sneak/chat/internal/config"
|
"git.eeqj.de/sneak/neoirc/internal/config"
|
||||||
"git.eeqj.de/sneak/chat/internal/db"
|
"git.eeqj.de/sneak/neoirc/internal/db"
|
||||||
"git.eeqj.de/sneak/chat/internal/globals"
|
"git.eeqj.de/sneak/neoirc/internal/globals"
|
||||||
"git.eeqj.de/sneak/chat/internal/handlers"
|
"git.eeqj.de/sneak/neoirc/internal/handlers"
|
||||||
"git.eeqj.de/sneak/chat/internal/healthcheck"
|
"git.eeqj.de/sneak/neoirc/internal/healthcheck"
|
||||||
"git.eeqj.de/sneak/chat/internal/logger"
|
"git.eeqj.de/sneak/neoirc/internal/logger"
|
||||||
"git.eeqj.de/sneak/chat/internal/middleware"
|
"git.eeqj.de/sneak/neoirc/internal/middleware"
|
||||||
"git.eeqj.de/sneak/chat/internal/server"
|
"git.eeqj.de/sneak/neoirc/internal/server"
|
||||||
"go.uber.org/fx"
|
"go.uber.org/fx"
|
||||||
"go.uber.org/fx/fxtest"
|
"go.uber.org/fx/fxtest"
|
||||||
)
|
)
|
||||||
@@ -115,7 +115,7 @@ func newTestServer(
|
|||||||
|
|
||||||
func newTestGlobals() *globals.Globals {
|
func newTestGlobals() *globals.Globals {
|
||||||
return &globals.Globals{
|
return &globals.Globals{
|
||||||
Appname: "chat-test",
|
Appname: "neoirc-test",
|
||||||
Version: "test",
|
Version: "test",
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -682,10 +682,10 @@ func TestChannelMessage(t *testing.T) {
|
|||||||
bobToken := tserver.createSession("bob_msg")
|
bobToken := tserver.createSession("bob_msg")
|
||||||
|
|
||||||
tserver.sendCommand(aliceToken, map[string]any{
|
tserver.sendCommand(aliceToken, map[string]any{
|
||||||
commandKey: joinCmd, toKey: "#chat",
|
commandKey: joinCmd, toKey: "#test",
|
||||||
})
|
})
|
||||||
tserver.sendCommand(bobToken, map[string]any{
|
tserver.sendCommand(bobToken, map[string]any{
|
||||||
commandKey: joinCmd, toKey: "#chat",
|
commandKey: joinCmd, toKey: "#test",
|
||||||
})
|
})
|
||||||
|
|
||||||
_, _ = tserver.pollMessages(aliceToken, 0)
|
_, _ = tserver.pollMessages(aliceToken, 0)
|
||||||
@@ -695,7 +695,7 @@ func TestChannelMessage(t *testing.T) {
|
|||||||
aliceToken,
|
aliceToken,
|
||||||
map[string]any{
|
map[string]any{
|
||||||
commandKey: privmsgCmd,
|
commandKey: privmsgCmd,
|
||||||
toKey: "#chat",
|
toKey: "#test",
|
||||||
bodyKey: []string{"hello world"},
|
bodyKey: []string{"hello world"},
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
@@ -725,11 +725,11 @@ func TestMessageMissingBody(t *testing.T) {
|
|||||||
token := tserver.createSession("nobody")
|
token := tserver.createSession("nobody")
|
||||||
|
|
||||||
tserver.sendCommand(token, map[string]any{
|
tserver.sendCommand(token, map[string]any{
|
||||||
commandKey: joinCmd, toKey: "#chat",
|
commandKey: joinCmd, toKey: "#test",
|
||||||
})
|
})
|
||||||
|
|
||||||
status, _ := tserver.sendCommand(token, map[string]any{
|
status, _ := tserver.sendCommand(token, map[string]any{
|
||||||
commandKey: privmsgCmd, toKey: "#chat",
|
commandKey: privmsgCmd, toKey: "#test",
|
||||||
})
|
})
|
||||||
if status != http.StatusBadRequest {
|
if status != http.StatusBadRequest {
|
||||||
t.Fatalf("expected 400, got %d", status)
|
t.Fatalf("expected 400, got %d", status)
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
// Package handlers provides HTTP request handlers for the chat server.
|
// Package handlers provides HTTP request handlers for the neoirc server.
|
||||||
package handlers
|
package handlers
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -7,13 +7,14 @@ import (
|
|||||||
"errors"
|
"errors"
|
||||||
"log/slog"
|
"log/slog"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"time"
|
||||||
|
|
||||||
"git.eeqj.de/sneak/chat/internal/broker"
|
"git.eeqj.de/sneak/neoirc/internal/broker"
|
||||||
"git.eeqj.de/sneak/chat/internal/config"
|
"git.eeqj.de/sneak/neoirc/internal/config"
|
||||||
"git.eeqj.de/sneak/chat/internal/db"
|
"git.eeqj.de/sneak/neoirc/internal/db"
|
||||||
"git.eeqj.de/sneak/chat/internal/globals"
|
"git.eeqj.de/sneak/neoirc/internal/globals"
|
||||||
"git.eeqj.de/sneak/chat/internal/healthcheck"
|
"git.eeqj.de/sneak/neoirc/internal/healthcheck"
|
||||||
"git.eeqj.de/sneak/chat/internal/logger"
|
"git.eeqj.de/sneak/neoirc/internal/logger"
|
||||||
"go.uber.org/fx"
|
"go.uber.org/fx"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -30,12 +31,15 @@ type Params struct {
|
|||||||
Healthcheck *healthcheck.Healthcheck
|
Healthcheck *healthcheck.Healthcheck
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const defaultIdleTimeout = 24 * time.Hour
|
||||||
|
|
||||||
// Handlers manages HTTP request handling.
|
// Handlers manages HTTP request handling.
|
||||||
type Handlers struct {
|
type Handlers struct {
|
||||||
params *Params
|
params *Params
|
||||||
log *slog.Logger
|
log *slog.Logger
|
||||||
hc *healthcheck.Healthcheck
|
hc *healthcheck.Healthcheck
|
||||||
broker *broker.Broker
|
broker *broker.Broker
|
||||||
|
cancelCleanup context.CancelFunc
|
||||||
}
|
}
|
||||||
|
|
||||||
// New creates a new Handlers instance.
|
// New creates a new Handlers instance.
|
||||||
@@ -43,7 +47,7 @@ func New(
|
|||||||
lifecycle fx.Lifecycle,
|
lifecycle fx.Lifecycle,
|
||||||
params Params,
|
params Params,
|
||||||
) (*Handlers, error) {
|
) (*Handlers, error) {
|
||||||
hdlr := &Handlers{
|
hdlr := &Handlers{ //nolint:exhaustruct // cancelCleanup set in startCleanup
|
||||||
params: ¶ms,
|
params: ¶ms,
|
||||||
log: params.Logger.Get(),
|
log: params.Logger.Get(),
|
||||||
hc: params.Healthcheck,
|
hc: params.Healthcheck,
|
||||||
@@ -51,10 +55,14 @@ func New(
|
|||||||
}
|
}
|
||||||
|
|
||||||
lifecycle.Append(fx.Hook{
|
lifecycle.Append(fx.Hook{
|
||||||
OnStart: func(_ context.Context) error {
|
OnStart: func(ctx context.Context) error {
|
||||||
|
hdlr.startCleanup(ctx)
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
OnStop: func(_ context.Context) error {
|
OnStop: func(_ context.Context) error {
|
||||||
|
hdlr.stopCleanup()
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
@@ -96,3 +104,100 @@ func (hdlr *Handlers) respondError(
|
|||||||
status,
|
status,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (hdlr *Handlers) idleTimeout() time.Duration {
|
||||||
|
raw := hdlr.params.Config.SessionIdleTimeout
|
||||||
|
if raw == "" {
|
||||||
|
return defaultIdleTimeout
|
||||||
|
}
|
||||||
|
|
||||||
|
dur, err := time.ParseDuration(raw)
|
||||||
|
if err != nil {
|
||||||
|
hdlr.log.Error(
|
||||||
|
"invalid SESSION_IDLE_TIMEOUT, using default",
|
||||||
|
"value", raw, "error", err,
|
||||||
|
)
|
||||||
|
|
||||||
|
return defaultIdleTimeout
|
||||||
|
}
|
||||||
|
|
||||||
|
return dur
|
||||||
|
}
|
||||||
|
|
||||||
|
// startCleanup launches the idle-user cleanup goroutine.
|
||||||
|
// We use context.Background rather than the OnStart ctx
|
||||||
|
// because the OnStart context is startup-scoped and would
|
||||||
|
// cancel the goroutine once all start hooks complete.
|
||||||
|
//
|
||||||
|
//nolint:contextcheck // intentional Background ctx
|
||||||
|
func (hdlr *Handlers) startCleanup(_ context.Context) {
|
||||||
|
cleanupCtx, cancel := context.WithCancel(
|
||||||
|
context.Background(),
|
||||||
|
)
|
||||||
|
hdlr.cancelCleanup = cancel
|
||||||
|
|
||||||
|
go hdlr.cleanupLoop(cleanupCtx)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (hdlr *Handlers) stopCleanup() {
|
||||||
|
if hdlr.cancelCleanup != nil {
|
||||||
|
hdlr.cancelCleanup()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (hdlr *Handlers) cleanupLoop(ctx context.Context) {
|
||||||
|
timeout := hdlr.idleTimeout()
|
||||||
|
|
||||||
|
interval := max(timeout/2, time.Minute) //nolint:mnd // half the timeout
|
||||||
|
|
||||||
|
ticker := time.NewTicker(interval)
|
||||||
|
defer ticker.Stop()
|
||||||
|
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case <-ticker.C:
|
||||||
|
hdlr.runCleanup(ctx, timeout)
|
||||||
|
case <-ctx.Done():
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (hdlr *Handlers) runCleanup(
|
||||||
|
ctx context.Context,
|
||||||
|
timeout time.Duration,
|
||||||
|
) {
|
||||||
|
cutoff := time.Now().Add(-timeout)
|
||||||
|
|
||||||
|
// Find sessions that will be orphaned so we can send
|
||||||
|
// QUIT notifications before deleting anything.
|
||||||
|
stale, err := hdlr.params.Database.
|
||||||
|
GetStaleOrphanSessions(ctx, cutoff)
|
||||||
|
if err != nil {
|
||||||
|
hdlr.log.Error(
|
||||||
|
"stale session lookup failed", "error", err,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, ss := range stale {
|
||||||
|
hdlr.cleanupUser(ctx, ss.ID, ss.Nick)
|
||||||
|
}
|
||||||
|
|
||||||
|
deleted, err := hdlr.params.Database.DeleteStaleUsers(
|
||||||
|
ctx, cutoff,
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
hdlr.log.Error(
|
||||||
|
"user cleanup failed", "error", err,
|
||||||
|
)
|
||||||
|
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if deleted > 0 {
|
||||||
|
hdlr.log.Info(
|
||||||
|
"cleaned up stale users",
|
||||||
|
"deleted", deleted,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -6,10 +6,10 @@ import (
|
|||||||
"log/slog"
|
"log/slog"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.eeqj.de/sneak/chat/internal/config"
|
"git.eeqj.de/sneak/neoirc/internal/config"
|
||||||
"git.eeqj.de/sneak/chat/internal/db"
|
"git.eeqj.de/sneak/neoirc/internal/db"
|
||||||
"git.eeqj.de/sneak/chat/internal/globals"
|
"git.eeqj.de/sneak/neoirc/internal/globals"
|
||||||
"git.eeqj.de/sneak/chat/internal/logger"
|
"git.eeqj.de/sneak/neoirc/internal/logger"
|
||||||
"go.uber.org/fx"
|
"go.uber.org/fx"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import (
|
|||||||
"log/slog"
|
"log/slog"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
"git.eeqj.de/sneak/chat/internal/globals"
|
"git.eeqj.de/sneak/neoirc/internal/globals"
|
||||||
"go.uber.org/fx"
|
"go.uber.org/fx"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
// Package middleware provides HTTP middleware for the chat server.
|
// Package middleware provides HTTP middleware for the neoirc server.
|
||||||
package middleware
|
package middleware
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -7,9 +7,9 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.eeqj.de/sneak/chat/internal/config"
|
"git.eeqj.de/sneak/neoirc/internal/config"
|
||||||
"git.eeqj.de/sneak/chat/internal/globals"
|
"git.eeqj.de/sneak/neoirc/internal/globals"
|
||||||
"git.eeqj.de/sneak/chat/internal/logger"
|
"git.eeqj.de/sneak/neoirc/internal/logger"
|
||||||
basicauth "github.com/99designs/basicauth-go"
|
basicauth "github.com/99designs/basicauth-go"
|
||||||
chimw "github.com/go-chi/chi/middleware"
|
chimw "github.com/go-chi/chi/middleware"
|
||||||
"github.com/go-chi/cors"
|
"github.com/go-chi/cors"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.eeqj.de/sneak/chat/web"
|
"git.eeqj.de/sneak/neoirc/web"
|
||||||
|
|
||||||
sentryhttp "github.com/getsentry/sentry-go/http"
|
sentryhttp "github.com/getsentry/sentry-go/http"
|
||||||
"github.com/go-chi/chi"
|
"github.com/go-chi/chi"
|
||||||
@@ -86,6 +86,14 @@ func (srv *Server) setupAPIv1(router chi.Router) {
|
|||||||
"/state",
|
"/state",
|
||||||
srv.handlers.HandleState(),
|
srv.handlers.HandleState(),
|
||||||
)
|
)
|
||||||
|
router.Post(
|
||||||
|
"/logout",
|
||||||
|
srv.handlers.HandleLogout(),
|
||||||
|
)
|
||||||
|
router.Get(
|
||||||
|
"/users/me",
|
||||||
|
srv.handlers.HandleUsersMe(),
|
||||||
|
)
|
||||||
router.Get(
|
router.Get(
|
||||||
"/messages",
|
"/messages",
|
||||||
srv.handlers.HandleGetMessages(),
|
srv.handlers.HandleGetMessages(),
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
// Package server implements the main HTTP server for the chat application.
|
// Package server implements the main HTTP server for the neoirc application.
|
||||||
package server
|
package server
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -12,11 +12,11 @@ import (
|
|||||||
"syscall"
|
"syscall"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.eeqj.de/sneak/chat/internal/config"
|
"git.eeqj.de/sneak/neoirc/internal/config"
|
||||||
"git.eeqj.de/sneak/chat/internal/globals"
|
"git.eeqj.de/sneak/neoirc/internal/globals"
|
||||||
"git.eeqj.de/sneak/chat/internal/handlers"
|
"git.eeqj.de/sneak/neoirc/internal/handlers"
|
||||||
"git.eeqj.de/sneak/chat/internal/logger"
|
"git.eeqj.de/sneak/neoirc/internal/logger"
|
||||||
"git.eeqj.de/sneak/chat/internal/middleware"
|
"git.eeqj.de/sneak/neoirc/internal/middleware"
|
||||||
"go.uber.org/fx"
|
"go.uber.org/fx"
|
||||||
|
|
||||||
"github.com/getsentry/sentry-go"
|
"github.com/getsentry/sentry-go"
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# Message Schemas
|
# Message Schemas
|
||||||
|
|
||||||
JSON Schema definitions (draft 2020-12) for the chat protocol. Messages use
|
JSON Schema definitions (draft 2020-12) for the neoirc protocol. Messages use
|
||||||
**IRC command names and numeric reply codes** (RFC 1459/2812) encoded as JSON
|
**IRC command names and numeric reply codes** (RFC 1459/2812) encoded as JSON
|
||||||
over HTTP.
|
over HTTP.
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||||
"$id": "https://git.eeqj.de/sneak/chat/schema/commands/JOIN.json",
|
"$id": "https://git.eeqj.de/sneak/neoirc/schema/commands/JOIN.json",
|
||||||
"title": "JOIN",
|
"title": "JOIN",
|
||||||
"description": "Join a channel. C2S: request to join. S2C: notification that a user joined. RFC 1459 §4.2.1.",
|
"description": "Join a channel. C2S: request to join. S2C: notification that a user joined. RFC 1459 §4.2.1.",
|
||||||
"$ref": "../message.json",
|
"$ref": "../message.json",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||||
"$id": "https://git.eeqj.de/sneak/chat/schema/commands/KICK.json",
|
"$id": "https://git.eeqj.de/sneak/neoirc/schema/commands/KICK.json",
|
||||||
"title": "KICK",
|
"title": "KICK",
|
||||||
"description": "Kick a user from a channel. RFC 1459 §4.2.8.",
|
"description": "Kick a user from a channel. RFC 1459 §4.2.8.",
|
||||||
"$ref": "../message.json",
|
"$ref": "../message.json",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||||
"$id": "https://git.eeqj.de/sneak/chat/schema/commands/MODE.json",
|
"$id": "https://git.eeqj.de/sneak/neoirc/schema/commands/MODE.json",
|
||||||
"title": "MODE",
|
"title": "MODE",
|
||||||
"description": "Set or query channel/user modes. RFC 1459 §4.2.3.",
|
"description": "Set or query channel/user modes. RFC 1459 §4.2.3.",
|
||||||
"$ref": "../message.json",
|
"$ref": "../message.json",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||||
"$id": "https://git.eeqj.de/sneak/chat/schema/commands/NICK.json",
|
"$id": "https://git.eeqj.de/sneak/neoirc/schema/commands/NICK.json",
|
||||||
"title": "NICK",
|
"title": "NICK",
|
||||||
"description": "Change nickname. C2S: request new nick. S2C: notification of nick change. RFC 1459 §4.1.2.",
|
"description": "Change nickname. C2S: request new nick. S2C: notification of nick change. RFC 1459 §4.1.2.",
|
||||||
"$ref": "../message.json",
|
"$ref": "../message.json",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||||
"$id": "https://git.eeqj.de/sneak/chat/schema/commands/NOTICE.json",
|
"$id": "https://git.eeqj.de/sneak/neoirc/schema/commands/NOTICE.json",
|
||||||
"title": "NOTICE",
|
"title": "NOTICE",
|
||||||
"description": "Send a notice. Like PRIVMSG but must not trigger automatic replies. RFC 1459 §4.4.2.",
|
"description": "Send a notice. Like PRIVMSG but must not trigger automatic replies. RFC 1459 §4.4.2.",
|
||||||
"$ref": "../message.json",
|
"$ref": "../message.json",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||||
"$id": "https://git.eeqj.de/sneak/chat/schema/commands/PART.json",
|
"$id": "https://git.eeqj.de/sneak/neoirc/schema/commands/PART.json",
|
||||||
"title": "PART",
|
"title": "PART",
|
||||||
"description": "Leave a channel. C2S: request to leave. S2C: notification that a user left. RFC 1459 §4.2.2.",
|
"description": "Leave a channel. C2S: request to leave. S2C: notification that a user left. RFC 1459 §4.2.2.",
|
||||||
"$ref": "../message.json",
|
"$ref": "../message.json",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||||
"$id": "https://git.eeqj.de/sneak/chat/schema/commands/PING.json",
|
"$id": "https://git.eeqj.de/sneak/neoirc/schema/commands/PING.json",
|
||||||
"title": "PING",
|
"title": "PING",
|
||||||
"description": "Keepalive. C2S or S2S. Server responds with PONG. RFC 1459 §4.6.2.",
|
"description": "Keepalive. C2S or S2S. Server responds with PONG. RFC 1459 §4.6.2.",
|
||||||
"$ref": "../message.json",
|
"$ref": "../message.json",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||||
"$id": "https://git.eeqj.de/sneak/chat/schema/commands/PONG.json",
|
"$id": "https://git.eeqj.de/sneak/neoirc/schema/commands/PONG.json",
|
||||||
"title": "PONG",
|
"title": "PONG",
|
||||||
"description": "Keepalive response. S2C or S2S. RFC 1459 §4.6.3.",
|
"description": "Keepalive response. S2C or S2S. RFC 1459 §4.6.3.",
|
||||||
"$ref": "../message.json",
|
"$ref": "../message.json",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||||
"$id": "https://git.eeqj.de/sneak/chat/schema/commands/PRIVMSG.json",
|
"$id": "https://git.eeqj.de/sneak/neoirc/schema/commands/PRIVMSG.json",
|
||||||
"title": "PRIVMSG",
|
"title": "PRIVMSG",
|
||||||
"description": "Send a message to a channel or user. C2S: client sends to server. S2C: server relays to recipients. RFC 1459 §4.4.1.",
|
"description": "Send a message to a channel or user. C2S: client sends to server. S2C: server relays to recipients. RFC 1459 §4.4.1.",
|
||||||
"$ref": "../message.json",
|
"$ref": "../message.json",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||||
"$id": "https://git.eeqj.de/sneak/chat/schema/commands/PUBKEY.json",
|
"$id": "https://git.eeqj.de/sneak/neoirc/schema/commands/PUBKEY.json",
|
||||||
"title": "PUBKEY",
|
"title": "PUBKEY",
|
||||||
"description": "Announce or relay a user's public signing key. C2S: client announces key to channel or server. S2C: server relays to channel members. Protocol extension (not in RFC 1459). Body is a structured object (not an array) containing the key material.",
|
"description": "Announce or relay a user's public signing key. C2S: client announces key to channel or server. S2C: server relays to channel members. Protocol extension (not in RFC 1459). Body is a structured object (not an array) containing the key material.",
|
||||||
"$ref": "../message.json",
|
"$ref": "../message.json",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||||
"$id": "https://git.eeqj.de/sneak/chat/schema/commands/QUIT.json",
|
"$id": "https://git.eeqj.de/sneak/neoirc/schema/commands/QUIT.json",
|
||||||
"title": "QUIT",
|
"title": "QUIT",
|
||||||
"description": "User disconnected. S2C only. RFC 1459 §4.1.6.",
|
"description": "User disconnected. S2C only. RFC 1459 §4.1.6.",
|
||||||
"$ref": "../message.json",
|
"$ref": "../message.json",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||||
"$id": "https://git.eeqj.de/sneak/chat/schema/commands/TOPIC.json",
|
"$id": "https://git.eeqj.de/sneak/neoirc/schema/commands/TOPIC.json",
|
||||||
"title": "TOPIC",
|
"title": "TOPIC",
|
||||||
"description": "Get or set channel topic. C2S: set topic (body present) or query (body absent). S2C: topic change notification. RFC 1459 §4.2.4.",
|
"description": "Get or set channel topic. C2S: set topic (body present) or query (body absent). S2C: topic change notification. RFC 1459 §4.2.4.",
|
||||||
"$ref": "../message.json",
|
"$ref": "../message.json",
|
||||||
@@ -17,6 +17,6 @@
|
|||||||
},
|
},
|
||||||
"required": ["command", "to"],
|
"required": ["command", "to"],
|
||||||
"examples": [
|
"examples": [
|
||||||
{ "command": "TOPIC", "from": "alice", "to": "#general", "body": ["Welcome to the chat"] }
|
{ "command": "TOPIC", "from": "alice", "to": "#general", "body": ["Welcome to the channel"] }
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||||
"$id": "https://git.eeqj.de/sneak/chat/schema/message.json",
|
"$id": "https://git.eeqj.de/sneak/neoirc/schema/message.json",
|
||||||
"title": "IRC Message Envelope",
|
"title": "IRC Message Envelope",
|
||||||
"description": "Base envelope for all messages. Mirrors IRC wire format (RFC 1459/2812) encoded as JSON over HTTP. The 'command' field carries either an IRC command name (PRIVMSG, JOIN, etc.) or a three-digit numeric reply code (001, 353, 433, etc.).",
|
"description": "Base envelope for all messages. Mirrors IRC wire format (RFC 1459/2812) encoded as JSON over HTTP. The 'command' field carries either an IRC command name (PRIVMSG, JOIN, etc.) or a three-digit numeric reply code (001, 353, 433, etc.).",
|
||||||
"type": "object",
|
"type": "object",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||||
"$id": "https://git.eeqj.de/sneak/chat/schema/numerics/001.json",
|
"$id": "https://git.eeqj.de/sneak/neoirc/schema/numerics/001.json",
|
||||||
"title": "001 RPL_WELCOME",
|
"title": "001 RPL_WELCOME",
|
||||||
"description": "Welcome message sent after successful session creation. RFC 2812 \u00a75.1.",
|
"description": "Welcome message sent after successful session creation. RFC 2812 \u00a75.1.",
|
||||||
"$ref": "../message.json",
|
"$ref": "../message.json",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||||
"$id": "https://git.eeqj.de/sneak/chat/schema/numerics/002.json",
|
"$id": "https://git.eeqj.de/sneak/neoirc/schema/numerics/002.json",
|
||||||
"title": "002 RPL_YOURHOST",
|
"title": "002 RPL_YOURHOST",
|
||||||
"description": "Server host info sent after session creation. RFC 2812 \u00a75.1.",
|
"description": "Server host info sent after session creation. RFC 2812 \u00a75.1.",
|
||||||
"$ref": "../message.json",
|
"$ref": "../message.json",
|
||||||
@@ -29,7 +29,7 @@
|
|||||||
"command": "002",
|
"command": "002",
|
||||||
"to": "alice",
|
"to": "alice",
|
||||||
"body": [
|
"body": [
|
||||||
"Your host is chat.example.com, running version 0.1.0"
|
"Your host is neoirc.example.com, running version 0.1.0"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||||
"$id": "https://git.eeqj.de/sneak/chat/schema/numerics/003.json",
|
"$id": "https://git.eeqj.de/sneak/neoirc/schema/numerics/003.json",
|
||||||
"title": "003 RPL_CREATED",
|
"title": "003 RPL_CREATED",
|
||||||
"description": "Server creation date. RFC 2812 \u00a75.1.",
|
"description": "Server creation date. RFC 2812 \u00a75.1.",
|
||||||
"$ref": "../message.json",
|
"$ref": "../message.json",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||||
"$id": "https://git.eeqj.de/sneak/chat/schema/numerics/004.json",
|
"$id": "https://git.eeqj.de/sneak/neoirc/schema/numerics/004.json",
|
||||||
"title": "004 RPL_MYINFO",
|
"title": "004 RPL_MYINFO",
|
||||||
"description": "Server info (name, version, available modes). RFC 2812 \u00a75.1.",
|
"description": "Server info (name, version, available modes). RFC 2812 \u00a75.1.",
|
||||||
"$ref": "../message.json",
|
"$ref": "../message.json",
|
||||||
@@ -29,7 +29,7 @@
|
|||||||
"command": "004",
|
"command": "004",
|
||||||
"to": "alice",
|
"to": "alice",
|
||||||
"params": [
|
"params": [
|
||||||
"chat.example.com",
|
"neoirc.example.com",
|
||||||
"0.1.0",
|
"0.1.0",
|
||||||
"o",
|
"o",
|
||||||
"imnst+ov"
|
"imnst+ov"
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||||
"$id": "https://git.eeqj.de/sneak/chat/schema/numerics/322.json",
|
"$id": "https://git.eeqj.de/sneak/neoirc/schema/numerics/322.json",
|
||||||
"title": "322 RPL_LIST",
|
"title": "322 RPL_LIST",
|
||||||
"description": "Channel list entry. One per channel in response to LIST. RFC 1459 \u00a76.2.",
|
"description": "Channel list entry. One per channel in response to LIST. RFC 1459 \u00a76.2.",
|
||||||
"$ref": "../message.json",
|
"$ref": "../message.json",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||||
"$id": "https://git.eeqj.de/sneak/chat/schema/numerics/323.json",
|
"$id": "https://git.eeqj.de/sneak/neoirc/schema/numerics/323.json",
|
||||||
"title": "323 RPL_LISTEND",
|
"title": "323 RPL_LISTEND",
|
||||||
"description": "End of channel list. RFC 1459 \u00a76.2.",
|
"description": "End of channel list. RFC 1459 \u00a76.2.",
|
||||||
"$ref": "../message.json",
|
"$ref": "../message.json",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||||
"$id": "https://git.eeqj.de/sneak/chat/schema/numerics/332.json",
|
"$id": "https://git.eeqj.de/sneak/neoirc/schema/numerics/332.json",
|
||||||
"title": "332 RPL_TOPIC",
|
"title": "332 RPL_TOPIC",
|
||||||
"description": "Channel topic (sent on JOIN or TOPIC query). RFC 1459 \u00a76.2.",
|
"description": "Channel topic (sent on JOIN or TOPIC query). RFC 1459 \u00a76.2.",
|
||||||
"$ref": "../message.json",
|
"$ref": "../message.json",
|
||||||
@@ -40,7 +40,7 @@
|
|||||||
"#general"
|
"#general"
|
||||||
],
|
],
|
||||||
"body": [
|
"body": [
|
||||||
"Welcome to the chat"
|
"Welcome to the channel"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||||
"$id": "https://git.eeqj.de/sneak/chat/schema/numerics/353.json",
|
"$id": "https://git.eeqj.de/sneak/neoirc/schema/numerics/353.json",
|
||||||
"title": "353 RPL_NAMREPLY",
|
"title": "353 RPL_NAMREPLY",
|
||||||
"description": "Channel member list. Sent on JOIN or NAMES query. RFC 1459 \u00a76.2.",
|
"description": "Channel member list. Sent on JOIN or NAMES query. RFC 1459 \u00a76.2.",
|
||||||
"$ref": "../message.json",
|
"$ref": "../message.json",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||||
"$id": "https://git.eeqj.de/sneak/chat/schema/numerics/366.json",
|
"$id": "https://git.eeqj.de/sneak/neoirc/schema/numerics/366.json",
|
||||||
"title": "366 RPL_ENDOFNAMES",
|
"title": "366 RPL_ENDOFNAMES",
|
||||||
"description": "End of NAMES list. RFC 1459 \u00a76.2.",
|
"description": "End of NAMES list. RFC 1459 \u00a76.2.",
|
||||||
"$ref": "../message.json",
|
"$ref": "../message.json",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||||
"$id": "https://git.eeqj.de/sneak/chat/schema/numerics/372.json",
|
"$id": "https://git.eeqj.de/sneak/neoirc/schema/numerics/372.json",
|
||||||
"title": "372 RPL_MOTD",
|
"title": "372 RPL_MOTD",
|
||||||
"description": "MOTD line. One message per line of the MOTD. RFC 2812 \u00a75.1.",
|
"description": "MOTD line. One message per line of the MOTD. RFC 2812 \u00a75.1.",
|
||||||
"$ref": "../message.json",
|
"$ref": "../message.json",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||||
"$id": "https://git.eeqj.de/sneak/chat/schema/numerics/375.json",
|
"$id": "https://git.eeqj.de/sneak/neoirc/schema/numerics/375.json",
|
||||||
"title": "375 RPL_MOTDSTART",
|
"title": "375 RPL_MOTDSTART",
|
||||||
"description": "Start of MOTD. RFC 2812 \u00a75.1.",
|
"description": "Start of MOTD. RFC 2812 \u00a75.1.",
|
||||||
"$ref": "../message.json",
|
"$ref": "../message.json",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||||
"$id": "https://git.eeqj.de/sneak/chat/schema/numerics/376.json",
|
"$id": "https://git.eeqj.de/sneak/neoirc/schema/numerics/376.json",
|
||||||
"title": "376 RPL_ENDOFMOTD",
|
"title": "376 RPL_ENDOFMOTD",
|
||||||
"description": "End of MOTD. RFC 2812 \u00a75.1.",
|
"description": "End of MOTD. RFC 2812 \u00a75.1.",
|
||||||
"$ref": "../message.json",
|
"$ref": "../message.json",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||||
"$id": "https://git.eeqj.de/sneak/chat/schema/numerics/401.json",
|
"$id": "https://git.eeqj.de/sneak/neoirc/schema/numerics/401.json",
|
||||||
"title": "401 ERR_NOSUCHNICK",
|
"title": "401 ERR_NOSUCHNICK",
|
||||||
"description": "No such nick/channel. RFC 1459 \u00a76.1.",
|
"description": "No such nick/channel. RFC 1459 \u00a76.1.",
|
||||||
"$ref": "../message.json",
|
"$ref": "../message.json",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||||
"$id": "https://git.eeqj.de/sneak/chat/schema/numerics/403.json",
|
"$id": "https://git.eeqj.de/sneak/neoirc/schema/numerics/403.json",
|
||||||
"title": "403 ERR_NOSUCHCHANNEL",
|
"title": "403 ERR_NOSUCHCHANNEL",
|
||||||
"description": "No such channel. RFC 1459 \u00a76.1.",
|
"description": "No such channel. RFC 1459 \u00a76.1.",
|
||||||
"$ref": "../message.json",
|
"$ref": "../message.json",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||||
"$id": "https://git.eeqj.de/sneak/chat/schema/numerics/433.json",
|
"$id": "https://git.eeqj.de/sneak/neoirc/schema/numerics/433.json",
|
||||||
"title": "433 ERR_NICKNAMEINUSE",
|
"title": "433 ERR_NICKNAMEINUSE",
|
||||||
"description": "Nickname is already in use. RFC 1459 \u00a76.1.",
|
"description": "Nickname is already in use. RFC 1459 \u00a76.1.",
|
||||||
"$ref": "../message.json",
|
"$ref": "../message.json",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||||
"$id": "https://git.eeqj.de/sneak/chat/schema/numerics/442.json",
|
"$id": "https://git.eeqj.de/sneak/neoirc/schema/numerics/442.json",
|
||||||
"title": "442 ERR_NOTONCHANNEL",
|
"title": "442 ERR_NOTONCHANNEL",
|
||||||
"description": "You're not on that channel. RFC 1459 \u00a76.1.",
|
"description": "You're not on that channel. RFC 1459 \u00a76.1.",
|
||||||
"$ref": "../message.json",
|
"$ref": "../message.json",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||||
"$id": "https://git.eeqj.de/sneak/chat/schema/numerics/482.json",
|
"$id": "https://git.eeqj.de/sneak/neoirc/schema/numerics/482.json",
|
||||||
"title": "482 ERR_CHANOPRIVSNEEDED",
|
"title": "482 ERR_CHANOPRIVSNEEDED",
|
||||||
"description": "You're not channel operator. RFC 1459 \u00a76.1.",
|
"description": "You're not channel operator. RFC 1459 \u00a76.1.",
|
||||||
"$ref": "../message.json",
|
"$ref": "../message.json",
|
||||||
|
|||||||
4
web/dist/app.js
vendored
4
web/dist/app.js
vendored
File diff suppressed because one or more lines are too long
2
web/dist/index.html
vendored
2
web/dist/index.html
vendored
@@ -3,7 +3,7 @@
|
|||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
<title>Chat</title>
|
<title>NeoIRC</title>
|
||||||
<link rel="stylesheet" href="/style.css">
|
<link rel="stylesheet" href="/style.css">
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ const RECONNECT_DELAY = 3000;
|
|||||||
const MEMBER_REFRESH_INTERVAL = 10000;
|
const MEMBER_REFRESH_INTERVAL = 10000;
|
||||||
|
|
||||||
function api(path, opts = {}) {
|
function api(path, opts = {}) {
|
||||||
const token = localStorage.getItem('chat_token');
|
const token = localStorage.getItem('neoirc_token');
|
||||||
const headers = { 'Content-Type': 'application/json', ...(opts.headers || {}) };
|
const headers = { 'Content-Type': 'application/json', ...(opts.headers || {}) };
|
||||||
if (token) headers['Authorization'] = `Bearer ${token}`;
|
if (token) headers['Authorization'] = `Bearer ${token}`;
|
||||||
const { signal, ...rest } = opts;
|
const { signal, ...rest } = opts;
|
||||||
@@ -34,7 +34,7 @@ function LoginScreen({ onLogin }) {
|
|||||||
const [nick, setNick] = useState('');
|
const [nick, setNick] = useState('');
|
||||||
const [error, setError] = useState('');
|
const [error, setError] = useState('');
|
||||||
const [motd, setMotd] = useState('');
|
const [motd, setMotd] = useState('');
|
||||||
const [serverName, setServerName] = useState('Chat');
|
const [serverName, setServerName] = useState('NeoIRC');
|
||||||
const inputRef = useRef();
|
const inputRef = useRef();
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -42,9 +42,9 @@ function LoginScreen({ onLogin }) {
|
|||||||
if (s.name) setServerName(s.name);
|
if (s.name) setServerName(s.name);
|
||||||
if (s.motd) setMotd(s.motd);
|
if (s.motd) setMotd(s.motd);
|
||||||
}).catch(() => {});
|
}).catch(() => {});
|
||||||
const saved = localStorage.getItem('chat_token');
|
const saved = localStorage.getItem('neoirc_token');
|
||||||
if (saved) {
|
if (saved) {
|
||||||
api('/state').then(u => onLogin(u.nick)).catch(() => localStorage.removeItem('chat_token'));
|
api('/state').then(u => onLogin(u.nick)).catch(() => localStorage.removeItem('neoirc_token'));
|
||||||
}
|
}
|
||||||
inputRef.current?.focus();
|
inputRef.current?.focus();
|
||||||
}, []);
|
}, []);
|
||||||
@@ -57,7 +57,7 @@ function LoginScreen({ onLogin }) {
|
|||||||
method: 'POST',
|
method: 'POST',
|
||||||
body: JSON.stringify({ nick: nick.trim() })
|
body: JSON.stringify({ nick: nick.trim() })
|
||||||
});
|
});
|
||||||
localStorage.setItem('chat_token', res.token);
|
localStorage.setItem('neoirc_token', res.token);
|
||||||
onLogin(res.nick);
|
onLogin(res.nick);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
setError(err.data?.error || 'Connection failed');
|
setError(err.data?.error || 'Connection failed');
|
||||||
@@ -132,7 +132,7 @@ function App() {
|
|||||||
// Persist joined channels
|
// Persist joined channels
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const channels = tabs.filter(t => t.type === 'channel').map(t => t.name);
|
const channels = tabs.filter(t => t.type === 'channel').map(t => t.name);
|
||||||
localStorage.setItem('chat_channels', JSON.stringify(channels));
|
localStorage.setItem('neoirc_channels', JSON.stringify(channels));
|
||||||
}, [tabs]);
|
}, [tabs]);
|
||||||
|
|
||||||
// Clear unread on tab switch
|
// Clear unread on tab switch
|
||||||
@@ -321,7 +321,7 @@ function App() {
|
|||||||
setLoggedIn(true);
|
setLoggedIn(true);
|
||||||
addSystemMessage('Server', `Connected as ${userNick}`);
|
addSystemMessage('Server', `Connected as ${userNick}`);
|
||||||
// Auto-rejoin saved channels
|
// Auto-rejoin saved channels
|
||||||
const saved = JSON.parse(localStorage.getItem('chat_channels') || '[]');
|
const saved = JSON.parse(localStorage.getItem('neoirc_channels') || '[]');
|
||||||
for (const ch of saved) {
|
for (const ch of saved) {
|
||||||
try {
|
try {
|
||||||
await api('/messages', { method: 'POST', body: JSON.stringify({ command: 'JOIN', to: ch }) });
|
await api('/messages', { method: 'POST', body: JSON.stringify({ command: 'JOIN', to: ch }) });
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
<title>Chat</title>
|
<title>NeoIRC</title>
|
||||||
<link rel="stylesheet" href="/style.css">
|
<link rel="stylesheet" href="/style.css">
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
|||||||
Reference in New Issue
Block a user