mirror of
https://github.com/runbear-io/beardrive.git
synced 2026-08-25 08:08:08 +02:00
The web server (bdrive web) becomes a full sync hub, and client devices
get one-command onboarding — without ever seeing storage info or holding
cloud credentials:
- bdrive web -c config.json: server configurable from a JSON file
(remote/addr/upload/upload_ttl/projects_db); explicit flags win.
- Hub mode: pointing bdrive web at a storage root hosts many projects,
each under <root>/<project-id>/ (remote.Prefixed). Projects live in a
file-backed registry (projects.json — loaded at open, rewritten
atomically per change) with create-or-join-by-name semantics.
- Per-project APIs: /api/projects (list/create/get) and
/api/p/<id>/{tree,file,render,download,upload/*,store/*}. The web UI
grows a project list with per-project browsing and hash deep links.
- Browser uploads and a store proxy for syncing devices: presigned
direct-to-storage PUTs when the backend can sign (S3 presign, GCS V4
signed URLs; expiring, credential-free), relayed through the server
otherwise. Journals are never presigned — only immutable blobs.
Blobs-before-journal and one-writer-per-journal invariants hold.
- https:// remote backend: a device syncs one hub project through
/api/p/<id>/store/* — mnt/sync/daemon/log all work unchanged.
- bdrive login <url>: verify a hub and remember it as the device default
(settings.json). bdrive init: create-or-join a project named after the
folder (--name/--project override), write .bdrive, seed a starter
.bdriveignore, mount, and start the daemon — one command per project.
- Hard-break rename: .beardrive->.bdrive, .beardriveignore->.bdriveignore,
~/.beardrive->~/.bdrive, BEARDRIVE_HOME->BDRIVE_HOME, temp/conflict
prefixes; old names are no longer read.
- Tests: presigning, project registry persistence, store API validation
and gating, project isolation over live HTTP, browser upload flows, and
two-device convergence through a hub (incl. read-only pull-only mode).
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01R7Q9ZKSZRTdvrSJkYLUmYs
149 lines
3.8 KiB
Go
149 lines
3.8 KiB
Go
// Package journal implements beardrive's append-only operation log.
|
|
//
|
|
// Every change to a volume is recorded as an Op in a per-device JSONL
|
|
// journal. Journals are append-only and each device only ever writes its
|
|
// own journal, so syncing is conflict-free at the transport level: a sync
|
|
// uploads your journal and downloads everyone else's. The merged view of
|
|
// a volume is a deterministic replay of the union of all ops ordered by
|
|
// (lamport, time, device, seq) — every device converges to the same state.
|
|
package journal
|
|
|
|
import (
|
|
"bufio"
|
|
"bytes"
|
|
"encoding/json"
|
|
"fmt"
|
|
"os"
|
|
"sort"
|
|
"time"
|
|
)
|
|
|
|
const (
|
|
KindPut = "put"
|
|
KindDelete = "delete"
|
|
)
|
|
|
|
// Op is a single journaled file operation.
|
|
type Op struct {
|
|
Seq int64 `json:"seq"` // per-device sequence number, 1-based
|
|
Lamport int64 `json:"lamport"` // logical clock for cross-device ordering
|
|
Time time.Time `json:"time"`
|
|
Device string `json:"device"`
|
|
DeviceName string `json:"device_name,omitempty"`
|
|
Author string `json:"author,omitempty"`
|
|
Kind string `json:"kind"` // "put" or "delete"
|
|
Path string `json:"path"` // slash-separated, relative to volume root
|
|
Blob string `json:"blob,omitempty"` // sha256 hex of content (put only)
|
|
Size int64 `json:"size,omitempty"`
|
|
Mode uint32 `json:"mode,omitempty"` // permission bits
|
|
Note string `json:"note,omitempty"` // e.g. "conflict copy of <path>"
|
|
}
|
|
|
|
// Less defines the total order used to replay ops from many devices.
|
|
func Less(a, b Op) bool {
|
|
if a.Lamport != b.Lamport {
|
|
return a.Lamport < b.Lamport
|
|
}
|
|
if !a.Time.Equal(b.Time) {
|
|
return a.Time.Before(b.Time)
|
|
}
|
|
if a.Device != b.Device {
|
|
return a.Device < b.Device
|
|
}
|
|
return a.Seq < b.Seq
|
|
}
|
|
|
|
func Sort(ops []Op) {
|
|
sort.SliceStable(ops, func(i, j int) bool { return Less(ops[i], ops[j]) })
|
|
}
|
|
|
|
// FileState is the resolved state of one path after replay.
|
|
type FileState struct {
|
|
Blob string
|
|
Size int64
|
|
Mode uint32
|
|
}
|
|
|
|
// Replay folds a set of ops (from any number of devices) into the
|
|
// resulting volume state. Last writer wins per path under the total order.
|
|
func Replay(ops []Op) map[string]FileState {
|
|
sorted := append([]Op(nil), ops...)
|
|
Sort(sorted)
|
|
state := make(map[string]FileState)
|
|
for _, op := range sorted {
|
|
switch op.Kind {
|
|
case KindPut:
|
|
state[op.Path] = FileState{Blob: op.Blob, Size: op.Size, Mode: op.Mode}
|
|
case KindDelete:
|
|
delete(state, op.Path)
|
|
}
|
|
}
|
|
return state
|
|
}
|
|
|
|
// Parse decodes a JSONL journal.
|
|
func Parse(data []byte) ([]Op, error) {
|
|
var ops []Op
|
|
sc := bufio.NewScanner(bytes.NewReader(data))
|
|
sc.Buffer(make([]byte, 0, 64*1024), 16*1024*1024)
|
|
for sc.Scan() {
|
|
line := bytes.TrimSpace(sc.Bytes())
|
|
if len(line) == 0 {
|
|
continue
|
|
}
|
|
var op Op
|
|
if err := json.Unmarshal(line, &op); err != nil {
|
|
return nil, fmt.Errorf("parse journal line %d: %w", len(ops)+1, err)
|
|
}
|
|
ops = append(ops, op)
|
|
}
|
|
if err := sc.Err(); err != nil {
|
|
return nil, err
|
|
}
|
|
return ops, nil
|
|
}
|
|
|
|
// ReadFile reads a journal file; a missing file is an empty journal.
|
|
func ReadFile(path string) ([]Op, error) {
|
|
data, err := os.ReadFile(path)
|
|
if err != nil {
|
|
if os.IsNotExist(err) {
|
|
return nil, nil
|
|
}
|
|
return nil, err
|
|
}
|
|
return Parse(data)
|
|
}
|
|
|
|
// Marshal encodes ops as JSONL, the journal wire format.
|
|
func Marshal(ops []Op) ([]byte, error) {
|
|
var buf bytes.Buffer
|
|
for _, op := range ops {
|
|
b, err := json.Marshal(op)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
buf.Write(b)
|
|
buf.WriteByte('\n')
|
|
}
|
|
return buf.Bytes(), nil
|
|
}
|
|
|
|
// Append appends ops to a journal file as JSONL.
|
|
func Append(path string, ops []Op) error {
|
|
if len(ops) == 0 {
|
|
return nil
|
|
}
|
|
data, err := Marshal(ops)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
f, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0o644)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer f.Close()
|
|
_, err = f.Write(data)
|
|
return err
|
|
}
|