MVP: IRC envelope format, long-polling, per-client queues, SPA rewrite
Major changes: - Consolidated schema into single migration with IRC envelope format - Messages table stores command/from/to/body(JSON)/meta(JSON) per spec - Per-client delivery queues (client_queues table) with fan-out - In-memory broker for long-poll notifications (no busy polling) - GET /messages supports ?after=<queue_id>&timeout=15 long-polling - All commands (JOIN/PART/NICK/TOPIC/QUIT/PING) broadcast events - Channels are ephemeral (deleted when last member leaves) - PRIVMSG to nicks (DMs) fan out to both sender and recipient - SPA rewritten in vanilla JS (no build step needed): - Long-poll via recursive fetch (not setInterval) - IRC envelope parsing with system message display - /nick, /join, /part, /msg, /quit commands - Unread indicators on inactive tabs - DM tabs from user list clicks - Removed unused models package (was for UUID-based schema) - Removed conflicting UUID-based db methods - Increased HTTP write timeout to 60s for long-poll support
This commit is contained in:
clawbot
@@ -4,8 +4,11 @@ import (
|
||||
"context"
|
||||
"crypto/rand"
|
||||
"encoding/hex"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"github.com/google/uuid"
|
||||
)
|
||||
|
||||
func generateToken() string {
|
||||
@@ -14,7 +17,34 @@ func generateToken() string {
|
||||
return hex.EncodeToString(b)
|
||||
}
|
||||
|
||||
// CreateUser registers a new user with the given nick and returns the user with token.
|
||||
// IRCMessage is the IRC envelope format for all messages.
|
||||
type IRCMessage struct {
|
||||
ID string `json:"id"`
|
||||
Command string `json:"command"`
|
||||
From string `json:"from,omitempty"`
|
||||
To string `json:"to,omitempty"`
|
||||
Body json.RawMessage `json:"body,omitempty"`
|
||||
TS string `json:"ts"`
|
||||
Meta json.RawMessage `json:"meta,omitempty"`
|
||||
// Internal DB fields (not in JSON)
|
||||
DBID int64 `json:"-"`
|
||||
}
|
||||
|
||||
// ChannelInfo is a lightweight channel representation.
|
||||
type ChannelInfo struct {
|
||||
ID int64 `json:"id"`
|
||||
Name string `json:"name"`
|
||||
Topic string `json:"topic"`
|
||||
}
|
||||
|
||||
// MemberInfo represents a channel member.
|
||||
type MemberInfo struct {
|
||||
ID int64 `json:"id"`
|
||||
Nick string `json:"nick"`
|
||||
LastSeen time.Time `json:"lastSeen"`
|
||||
}
|
||||
|
||||
// CreateUser registers a new user with the given nick.
|
||||
func (s *Database) CreateUser(ctx context.Context, nick string) (int64, string, error) {
|
||||
token := generateToken()
|
||||
now := time.Now()
|
||||
@@ -36,7 +66,6 @@ func (s *Database) GetUserByToken(ctx context.Context, token string) (int64, str
|
||||
if err != nil {
|
||||
return 0, "", err
|
||||
}
|
||||
// Update last_seen
|
||||
_, _ = s.db.ExecContext(ctx, "UPDATE users SET last_seen = ? WHERE id = ?", time.Now(), id)
|
||||
return id, nick, nil
|
||||
}
|
||||
@@ -82,6 +111,15 @@ func (s *Database) PartChannel(ctx context.Context, channelID, userID int64) err
|
||||
return err
|
||||
}
|
||||
|
||||
// DeleteChannelIfEmpty deletes a channel if it has no members.
|
||||
func (s *Database) DeleteChannelIfEmpty(ctx context.Context, channelID int64) error {
|
||||
_, err := s.db.ExecContext(ctx,
|
||||
`DELETE FROM channels WHERE id = ? AND NOT EXISTS
|
||||
(SELECT 1 FROM channel_members WHERE channel_id = ?)`,
|
||||
channelID, channelID)
|
||||
return err
|
||||
}
|
||||
|
||||
// ListChannels returns all channels the user has joined.
|
||||
func (s *Database) ListChannels(ctx context.Context, userID int64) ([]ChannelInfo, error) {
|
||||
rows, err := s.db.QueryContext(ctx,
|
||||
@@ -106,11 +144,26 @@ func (s *Database) ListChannels(ctx context.Context, userID int64) ([]ChannelInf
|
||||
return channels, nil
|
||||
}
|
||||
|
||||
// ChannelInfo is a lightweight channel representation.
|
||||
type ChannelInfo struct {
|
||||
ID int64 `json:"id"`
|
||||
Name string `json:"name"`
|
||||
Topic string `json:"topic"`
|
||||
// ListAllChannels returns all channels.
|
||||
func (s *Database) ListAllChannels(ctx context.Context) ([]ChannelInfo, error) {
|
||||
rows, err := s.db.QueryContext(ctx,
|
||||
"SELECT id, name, topic FROM channels ORDER BY name")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
var channels []ChannelInfo
|
||||
for rows.Next() {
|
||||
var ch ChannelInfo
|
||||
if err := rows.Scan(&ch.ID, &ch.Name, &ch.Topic); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
channels = append(channels, ch)
|
||||
}
|
||||
if channels == nil {
|
||||
channels = []ChannelInfo{}
|
||||
}
|
||||
return channels, nil
|
||||
}
|
||||
|
||||
// ChannelMembers returns all members of a channel.
|
||||
@@ -137,233 +190,155 @@ func (s *Database) ChannelMembers(ctx context.Context, channelID int64) ([]Membe
|
||||
return members, nil
|
||||
}
|
||||
|
||||
// MemberInfo represents a channel member.
|
||||
type MemberInfo struct {
|
||||
ID int64 `json:"id"`
|
||||
Nick string `json:"nick"`
|
||||
LastSeen time.Time `json:"lastSeen"`
|
||||
}
|
||||
|
||||
// MessageInfo represents a chat message.
|
||||
type MessageInfo struct {
|
||||
ID int64 `json:"id"`
|
||||
Channel string `json:"channel,omitempty"`
|
||||
Nick string `json:"nick"`
|
||||
Content string `json:"content"`
|
||||
IsDM bool `json:"isDm,omitempty"`
|
||||
DMTarget string `json:"dmTarget,omitempty"`
|
||||
CreatedAt time.Time `json:"createdAt"`
|
||||
}
|
||||
|
||||
// GetMessages returns messages for a channel, optionally after a given ID.
|
||||
func (s *Database) GetMessages(ctx context.Context, channelID int64, afterID int64, limit int) ([]MessageInfo, error) {
|
||||
if limit <= 0 {
|
||||
limit = 50
|
||||
}
|
||||
// GetChannelMemberIDs returns user IDs of all members in a channel.
|
||||
func (s *Database) GetChannelMemberIDs(ctx context.Context, channelID int64) ([]int64, error) {
|
||||
rows, err := s.db.QueryContext(ctx,
|
||||
`SELECT m.id, c.name, u.nick, m.content, m.created_at
|
||||
FROM messages m
|
||||
INNER JOIN users u ON u.id = m.user_id
|
||||
INNER JOIN channels c ON c.id = m.channel_id
|
||||
WHERE m.channel_id = ? AND m.is_dm = 0 AND m.id > ?
|
||||
ORDER BY m.id ASC LIMIT ?`, channelID, afterID, limit)
|
||||
"SELECT user_id FROM channel_members WHERE channel_id = ?", channelID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
var msgs []MessageInfo
|
||||
var ids []int64
|
||||
for rows.Next() {
|
||||
var m MessageInfo
|
||||
if err := rows.Scan(&m.ID, &m.Channel, &m.Nick, &m.Content, &m.CreatedAt); err != nil {
|
||||
var id int64
|
||||
if err := rows.Scan(&id); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
msgs = append(msgs, m)
|
||||
ids = append(ids, id)
|
||||
}
|
||||
if msgs == nil {
|
||||
msgs = []MessageInfo{}
|
||||
}
|
||||
return msgs, nil
|
||||
return ids, nil
|
||||
}
|
||||
|
||||
// SendMessage inserts a channel message.
|
||||
func (s *Database) SendMessage(ctx context.Context, channelID, userID int64, content string) (int64, error) {
|
||||
res, err := s.db.ExecContext(ctx,
|
||||
"INSERT INTO messages (channel_id, user_id, content, is_dm, created_at) VALUES (?, ?, ?, 0, ?)",
|
||||
channelID, userID, content, time.Now())
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
return res.LastInsertId()
|
||||
}
|
||||
|
||||
// SendDM inserts a direct message.
|
||||
func (s *Database) SendDM(ctx context.Context, fromID, toID int64, content string) (int64, error) {
|
||||
res, err := s.db.ExecContext(ctx,
|
||||
"INSERT INTO messages (user_id, content, is_dm, dm_target_id, created_at) VALUES (?, ?, 1, ?, ?)",
|
||||
fromID, content, toID, time.Now())
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
return res.LastInsertId()
|
||||
}
|
||||
|
||||
// GetDMs returns direct messages between two users after a given ID.
|
||||
func (s *Database) GetDMs(ctx context.Context, userA, userB int64, afterID int64, limit int) ([]MessageInfo, error) {
|
||||
if limit <= 0 {
|
||||
limit = 50
|
||||
}
|
||||
// GetUserChannelIDs returns channel IDs the user is a member of.
|
||||
func (s *Database) GetUserChannelIDs(ctx context.Context, userID int64) ([]int64, error) {
|
||||
rows, err := s.db.QueryContext(ctx,
|
||||
`SELECT m.id, u.nick, m.content, t.nick, m.created_at
|
||||
FROM messages m
|
||||
INNER JOIN users u ON u.id = m.user_id
|
||||
INNER JOIN users t ON t.id = m.dm_target_id
|
||||
WHERE m.is_dm = 1 AND m.id > ?
|
||||
AND ((m.user_id = ? AND m.dm_target_id = ?) OR (m.user_id = ? AND m.dm_target_id = ?))
|
||||
ORDER BY m.id ASC LIMIT ?`, afterID, userA, userB, userB, userA, limit)
|
||||
"SELECT channel_id FROM channel_members WHERE user_id = ?", userID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
var msgs []MessageInfo
|
||||
var ids []int64
|
||||
for rows.Next() {
|
||||
var m MessageInfo
|
||||
if err := rows.Scan(&m.ID, &m.Nick, &m.Content, &m.DMTarget, &m.CreatedAt); err != nil {
|
||||
var id int64
|
||||
if err := rows.Scan(&id); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
m.IsDM = true
|
||||
msgs = append(msgs, m)
|
||||
ids = append(ids, id)
|
||||
}
|
||||
if msgs == nil {
|
||||
msgs = []MessageInfo{}
|
||||
}
|
||||
return msgs, nil
|
||||
return ids, nil
|
||||
}
|
||||
|
||||
// PollMessages returns all new messages (channel + DM) for a user after a given ID.
|
||||
func (s *Database) PollMessages(ctx context.Context, userID int64, afterID int64, limit int) ([]MessageInfo, error) {
|
||||
// InsertMessage stores a message and returns its DB ID.
|
||||
func (s *Database) InsertMessage(ctx context.Context, command, from, to string, body json.RawMessage, meta json.RawMessage) (int64, string, error) {
|
||||
msgUUID := uuid.New().String()
|
||||
now := time.Now().UTC()
|
||||
if body == nil {
|
||||
body = json.RawMessage("[]")
|
||||
}
|
||||
if meta == nil {
|
||||
meta = json.RawMessage("{}")
|
||||
}
|
||||
res, err := s.db.ExecContext(ctx,
|
||||
`INSERT INTO messages (uuid, command, msg_from, msg_to, body, meta, created_at)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?)`,
|
||||
msgUUID, command, from, to, string(body), string(meta), now)
|
||||
if err != nil {
|
||||
return 0, "", err
|
||||
}
|
||||
id, _ := res.LastInsertId()
|
||||
return id, msgUUID, nil
|
||||
}
|
||||
|
||||
// EnqueueMessage adds a message to a user's delivery queue.
|
||||
func (s *Database) EnqueueMessage(ctx context.Context, userID, messageID int64) error {
|
||||
_, err := s.db.ExecContext(ctx,
|
||||
"INSERT OR IGNORE INTO client_queues (user_id, message_id, created_at) VALUES (?, ?, ?)",
|
||||
userID, messageID, time.Now())
|
||||
return err
|
||||
}
|
||||
|
||||
// PollMessages returns queued messages for a user after a given queue ID.
|
||||
func (s *Database) PollMessages(ctx context.Context, userID int64, afterQueueID int64, limit int) ([]IRCMessage, int64, error) {
|
||||
if limit <= 0 {
|
||||
limit = 100
|
||||
}
|
||||
rows, err := s.db.QueryContext(ctx,
|
||||
`SELECT m.id, COALESCE(c.name, ''), u.nick, m.content, m.is_dm, COALESCE(t.nick, ''), m.created_at
|
||||
FROM messages m
|
||||
INNER JOIN users u ON u.id = m.user_id
|
||||
LEFT JOIN channels c ON c.id = m.channel_id
|
||||
LEFT JOIN users t ON t.id = m.dm_target_id
|
||||
WHERE m.id > ? AND (
|
||||
(m.is_dm = 0 AND m.channel_id IN (SELECT channel_id FROM channel_members WHERE user_id = ?))
|
||||
OR (m.is_dm = 1 AND (m.user_id = ? OR m.dm_target_id = ?))
|
||||
)
|
||||
ORDER BY m.id ASC LIMIT ?`, afterID, userID, userID, userID, limit)
|
||||
`SELECT cq.id, m.uuid, m.command, m.msg_from, m.msg_to, m.body, m.meta, m.created_at
|
||||
FROM client_queues cq
|
||||
INNER JOIN messages m ON m.id = cq.message_id
|
||||
WHERE cq.user_id = ? AND cq.id > ?
|
||||
ORDER BY cq.id ASC LIMIT ?`, userID, afterQueueID, limit)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
return nil, afterQueueID, err
|
||||
}
|
||||
defer rows.Close()
|
||||
var msgs []MessageInfo
|
||||
|
||||
var msgs []IRCMessage
|
||||
var lastQID int64
|
||||
for rows.Next() {
|
||||
var m MessageInfo
|
||||
var isDM int
|
||||
if err := rows.Scan(&m.ID, &m.Channel, &m.Nick, &m.Content, &isDM, &m.DMTarget, &m.CreatedAt); err != nil {
|
||||
return nil, err
|
||||
var m IRCMessage
|
||||
var qID int64
|
||||
var body, meta string
|
||||
var ts time.Time
|
||||
if err := rows.Scan(&qID, &m.ID, &m.Command, &m.From, &m.To, &body, &meta, &ts); err != nil {
|
||||
return nil, afterQueueID, err
|
||||
}
|
||||
m.IsDM = isDM == 1
|
||||
m.Body = json.RawMessage(body)
|
||||
m.Meta = json.RawMessage(meta)
|
||||
m.TS = ts.Format(time.RFC3339Nano)
|
||||
m.DBID = qID
|
||||
lastQID = qID
|
||||
msgs = append(msgs, m)
|
||||
}
|
||||
if msgs == nil {
|
||||
msgs = []MessageInfo{}
|
||||
msgs = []IRCMessage{}
|
||||
}
|
||||
return msgs, nil
|
||||
if lastQID == 0 {
|
||||
lastQID = afterQueueID
|
||||
}
|
||||
return msgs, lastQID, nil
|
||||
}
|
||||
|
||||
// GetMessagesBefore returns channel messages before a given ID (for history scrollback).
|
||||
func (s *Database) GetMessagesBefore(ctx context.Context, channelID int64, beforeID int64, limit int) ([]MessageInfo, error) {
|
||||
// GetHistory returns message history for a target (channel or DM nick pair).
|
||||
func (s *Database) GetHistory(ctx context.Context, target string, beforeID int64, limit int) ([]IRCMessage, error) {
|
||||
if limit <= 0 {
|
||||
limit = 50
|
||||
}
|
||||
var query string
|
||||
var args []any
|
||||
if beforeID > 0 {
|
||||
query = `SELECT m.id, c.name, u.nick, m.content, m.created_at
|
||||
FROM messages m
|
||||
INNER JOIN users u ON u.id = m.user_id
|
||||
INNER JOIN channels c ON c.id = m.channel_id
|
||||
WHERE m.channel_id = ? AND m.is_dm = 0 AND m.id < ?
|
||||
ORDER BY m.id DESC LIMIT ?`
|
||||
args = []any{channelID, beforeID, limit}
|
||||
query = `SELECT id, uuid, command, msg_from, msg_to, body, meta, created_at
|
||||
FROM messages WHERE msg_to = ? AND id < ? AND command = 'PRIVMSG'
|
||||
ORDER BY id DESC LIMIT ?`
|
||||
args = []any{target, beforeID, limit}
|
||||
} else {
|
||||
query = `SELECT m.id, c.name, u.nick, m.content, m.created_at
|
||||
FROM messages m
|
||||
INNER JOIN users u ON u.id = m.user_id
|
||||
INNER JOIN channels c ON c.id = m.channel_id
|
||||
WHERE m.channel_id = ? AND m.is_dm = 0
|
||||
ORDER BY m.id DESC LIMIT ?`
|
||||
args = []any{channelID, limit}
|
||||
query = `SELECT id, uuid, command, msg_from, msg_to, body, meta, created_at
|
||||
FROM messages WHERE msg_to = ? AND command = 'PRIVMSG'
|
||||
ORDER BY id DESC LIMIT ?`
|
||||
args = []any{target, limit}
|
||||
}
|
||||
rows, err := s.db.QueryContext(ctx, query, args...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
var msgs []MessageInfo
|
||||
var msgs []IRCMessage
|
||||
for rows.Next() {
|
||||
var m MessageInfo
|
||||
if err := rows.Scan(&m.ID, &m.Channel, &m.Nick, &m.Content, &m.CreatedAt); err != nil {
|
||||
var m IRCMessage
|
||||
var dbID int64
|
||||
var body, meta string
|
||||
var ts time.Time
|
||||
if err := rows.Scan(&dbID, &m.ID, &m.Command, &m.From, &m.To, &body, &meta, &ts); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
m.Body = json.RawMessage(body)
|
||||
m.Meta = json.RawMessage(meta)
|
||||
m.TS = ts.Format(time.RFC3339Nano)
|
||||
m.DBID = dbID
|
||||
msgs = append(msgs, m)
|
||||
}
|
||||
if msgs == nil {
|
||||
msgs = []MessageInfo{}
|
||||
}
|
||||
// Reverse to ascending order
|
||||
for i, j := 0, len(msgs)-1; i < j; i, j = i+1, j-1 {
|
||||
msgs[i], msgs[j] = msgs[j], msgs[i]
|
||||
}
|
||||
return msgs, nil
|
||||
}
|
||||
|
||||
// GetDMsBefore returns DMs between two users before a given ID (for history scrollback).
|
||||
func (s *Database) GetDMsBefore(ctx context.Context, userA, userB int64, beforeID int64, limit int) ([]MessageInfo, error) {
|
||||
if limit <= 0 {
|
||||
limit = 50
|
||||
}
|
||||
var query string
|
||||
var args []any
|
||||
if beforeID > 0 {
|
||||
query = `SELECT m.id, u.nick, m.content, t.nick, m.created_at
|
||||
FROM messages m
|
||||
INNER JOIN users u ON u.id = m.user_id
|
||||
INNER JOIN users t ON t.id = m.dm_target_id
|
||||
WHERE m.is_dm = 1 AND m.id < ?
|
||||
AND ((m.user_id = ? AND m.dm_target_id = ?) OR (m.user_id = ? AND m.dm_target_id = ?))
|
||||
ORDER BY m.id DESC LIMIT ?`
|
||||
args = []any{beforeID, userA, userB, userB, userA, limit}
|
||||
} else {
|
||||
query = `SELECT m.id, u.nick, m.content, t.nick, m.created_at
|
||||
FROM messages m
|
||||
INNER JOIN users u ON u.id = m.user_id
|
||||
INNER JOIN users t ON t.id = m.dm_target_id
|
||||
WHERE m.is_dm = 1
|
||||
AND ((m.user_id = ? AND m.dm_target_id = ?) OR (m.user_id = ? AND m.dm_target_id = ?))
|
||||
ORDER BY m.id DESC LIMIT ?`
|
||||
args = []any{userA, userB, userB, userA, limit}
|
||||
}
|
||||
rows, err := s.db.QueryContext(ctx, query, args...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
var msgs []MessageInfo
|
||||
for rows.Next() {
|
||||
var m MessageInfo
|
||||
if err := rows.Scan(&m.ID, &m.Nick, &m.Content, &m.DMTarget, &m.CreatedAt); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
m.IsDM = true
|
||||
msgs = append(msgs, m)
|
||||
}
|
||||
if msgs == nil {
|
||||
msgs = []MessageInfo{}
|
||||
msgs = []IRCMessage{}
|
||||
}
|
||||
// Reverse to ascending order
|
||||
for i, j := 0, len(msgs)-1; i < j; i, j = i+1, j-1 {
|
||||
@@ -380,21 +355,24 @@ func (s *Database) ChangeNick(ctx context.Context, userID int64, newNick string)
|
||||
}
|
||||
|
||||
// SetTopic sets the topic for a channel.
|
||||
func (s *Database) SetTopic(ctx context.Context, channelName string, _ int64, topic string) error {
|
||||
func (s *Database) SetTopic(ctx context.Context, channelName string, topic string) error {
|
||||
_, err := s.db.ExecContext(ctx,
|
||||
"UPDATE channels SET topic = ? WHERE name = ?", topic, channelName)
|
||||
"UPDATE channels SET topic = ?, updated_at = ? WHERE name = ?", topic, time.Now(), channelName)
|
||||
return err
|
||||
}
|
||||
|
||||
// GetServerName returns the server name (unused, config provides this).
|
||||
func (s *Database) GetServerName() string {
|
||||
return ""
|
||||
// DeleteUser removes a user and all their data.
|
||||
func (s *Database) DeleteUser(ctx context.Context, userID int64) error {
|
||||
_, err := s.db.ExecContext(ctx, "DELETE FROM users WHERE id = ?", userID)
|
||||
return err
|
||||
}
|
||||
|
||||
// ListAllChannels returns all channels.
|
||||
func (s *Database) ListAllChannels(ctx context.Context) ([]ChannelInfo, error) {
|
||||
// GetAllChannelMembershipsForUser returns (channelID, channelName) for all channels a user is in.
|
||||
func (s *Database) GetAllChannelMembershipsForUser(ctx context.Context, userID int64) ([]ChannelInfo, error) {
|
||||
rows, err := s.db.QueryContext(ctx,
|
||||
"SELECT id, name, topic FROM channels ORDER BY name")
|
||||
`SELECT c.id, c.name, c.topic FROM channels c
|
||||
INNER JOIN channel_members cm ON cm.channel_id = c.id
|
||||
WHERE cm.user_id = ?`, userID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -407,8 +385,5 @@ func (s *Database) ListAllChannels(ctx context.Context) ([]ChannelInfo, error) {
|
||||
}
|
||||
channels = append(channels, ch)
|
||||
}
|
||||
if channels == nil {
|
||||
channels = []ChannelInfo{}
|
||||
}
|
||||
return channels, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user