docs(dev): integrate rest of the documentation

This commit is contained in:
Elian Doran
2025-11-04 18:16:20 +02:00
parent 7369f9d532
commit 7131d44d03
14 changed files with 772 additions and 3231 deletions

View File

@@ -0,0 +1,484 @@
# Synchronisation
Trilium implements a **bidirectional synchronization system** that allows users to sync their note databases across multiple devices (desktop clients and server instances). The sync protocol is designed to handle:
* Concurrent modifications across devices
* Simple conflict resolution (without “merge conflict” indication).
* Partial sync (only changed entities)
* Protected note synchronization
* Efficient bandwidth usage
## Sync Architecture
```mermaid
graph TB
Desktop1[Desktop 1<br/>Client]
Desktop2[Desktop 2<br/>Client]
subgraph SyncServer["Sync Server"]
SyncService[Sync Service<br/>- Entity Change Management<br/>- Conflict Resolution<br/>- Version Tracking]
SyncDB[(Database<br/>entity_changes)]
end
Desktop1 <-->|WebSocket/HTTP| SyncService
Desktop2 <-->|WebSocket/HTTP| SyncService
SyncService --> SyncDB
```
## Core Concepts
### Entity Changes
Every modification to any entity (note, branch, attribute, etc.) creates an **entity change** record:
```
entity_changes (
id, -- Auto-increment ID
entityName, -- 'notes', 'branches', 'attributes', etc.
entityId, -- ID of the changed entity
hash, -- Content hash for integrity
isErased, -- If entity was erased (deleted permanently)
changeId, -- Unique change identifier
componentId, -- Unique component/widget identifier
instanceId, -- Process instance identifier
isSynced, -- Whether synced to server
utcDateChanged -- When change occurred
)
```
**Key Properties:**
* **changeId**: Globally unique identifier (UUID) for the change
* **componentId**: Unique identifier of the component/widget that generated to change (can be used to avoid refreshing the widget being edited).
* **instanceId**: Unique per process (changes on restart)
* **hash**: SHA-256 hash of entity data for integrity verification
### Sync Versions
Each Trilium installation tracks:
* **Local sync version**: Highest change ID seen locally
* **Server sync version**: Highest change ID on server
* **Entity versions**: Last sync version for each entity type
### Change Tracking
**When an entity is modified:**
```typescript
// apps/server/src/services/entity_changes.ts
function addEntityChange(entityName, entityId, entity) {
const hash = calculateHash(entity)
const changeId = generateUUID()
sql.insert('entity_changes', {
entityName,
entityId,
hash,
changeId,
componentId: config.componentId,
instanceId: config.instanceId,
isSynced: 0,
utcDateChanged: now()
})
}
```
**Entity modification triggers:**
* Note content update
* Note metadata change
* Branch creation/deletion/reorder
* Attribute addition/removal
* Options modification
## Sync Protocol
### Sync Handshake
**Step 1: Client Initiates Sync**
```typescript
// Client sends current sync version
POST /api/sync/check
{
"sourceId": "client-component-id",
"maxChangeId": 12345
}
```
**Step 2: Server Responds with Status**
```typescript
// Server checks for changes
Response:
{
"entityChanges": 567, // Changes on server
"maxChangeId": 12890, // Server's max change ID
"outstandingPushCount": 23 // Client changes not yet synced
}
```
**Step 3: Decision**
* If `entityChanges > 0`: Pull changes from server
* If `outstandingPushCount > 0`: Push changes to server
* Both can happen in sequence
### Pull Sync (Server → Client)
**Client Requests Changes:**
```typescript
POST /api/sync/pull
{
"sourceId": "client-component-id",
"lastSyncedChangeId": 12345
}
```
**Server Responds:**
```typescript
Response:
{
"notes": [
{ noteId: "abc", title: "New Note", ... }
],
"branches": [...],
"attributes": [...],
"revisions": [...],
"attachments": [...],
"entityChanges": [
{ entityName: "notes", entityId: "abc", changeId: "...", ... }
],
"maxChangeId": 12890
}
```
**Client Processing:**
1. Apply entity changes to local database
2. Update Froca cache
3. Update local sync version
4. Trigger UI refresh
### Push Sync (Client → Server)
**Client Sends Changes:**
```typescript
POST /api/sync/push
{
"sourceId": "client-component-id",
"entities": [
{
"entity": {
"noteId": "xyz",
"title": "Modified Note",
...
},
"entityChange": {
"changeId": "change-uuid",
"entityName": "notes",
...
}
}
]
}
```
**Server Processing:**
1. Validate changes
2. Check for conflicts
3. Apply changes to database
4. Update Becca cache
5. Mark as synced
6. Broadcast to other connected clients via WebSocket
**Conflict Detection:**
```typescript
// Check if entity was modified on server since client's last sync
const serverEntity = becca.getNote(noteId)
const serverLastModified = serverEntity.utcDateModified
if (serverLastModified > clientSyncVersion) {
// CONFLICT!
resolveConflict(serverEntity, clientEntity)
}
```
## Conflict Resolution
### Conflict Types
**1\. Content Conflict**
* Both client and server modified same note content
* **Resolution**: Last-write-wins based on `utcDateModified`
**2\. Structure Conflict**
* Branch moved/deleted on one side, modified on other
* **Resolution**: Tombstone records, reconciliation
**3\. Attribute Conflict**
* Same attribute modified differently
* **Resolution**: Last-write-wins
### Conflict Resolution Strategy
**Last-Write-Wins:**
```typescript
if (clientEntity.utcDateModified > serverEntity.utcDateModified) {
// Client wins, apply client changes
applyClientChange(clientEntity)
} else {
// Server wins, reject client change
// Client will pull server version on next sync
}
```
**Tombstone Records:**
* Deleted entities leave tombstone in `entity_changes`
* Prevents re-sync of deleted items
* `isErased = 1` for permanent deletions
### Protected Notes Sync
**Challenge:** Encrypted content can't be synced without password
**Solution:**
1. **Encrypted sync**: Content synced in encrypted form
2. **Hash verification**: Integrity checked without decryption
3. **Lazy decryption**: Only decrypt when accessed
## Sync States
### Connection States
* **Connected**: WebSocket connection active
* **Disconnected**: No connection to sync server
* **Syncing**: Actively transferring data
* **Conflict**: Sync paused due to conflict
### Entity Sync States
Each entity can be in:
* **Synced**: In sync with server
* **Pending**: Local changes not yet pushed
* **Conflict**: Conflicting changes detected
### UI Indicators
```typescript
// apps/client/src/widgets/sync_status.ts
class SyncStatusWidget {
showSyncStatus() {
if (isConnected && allSynced) {
showIcon('synced')
} else if (isSyncing) {
showIcon('syncing-spinner')
} else {
showIcon('not-synced')
}
}
}
```
## Performance Optimizations
### Incremental Sync
Only entities changed since last sync are transferred:
```
SELECT * FROM entity_changes
WHERE id > :lastSyncedChangeId
ORDER BY id ASC
LIMIT 1000
```
### Batch Processing
Changes sent in batches to reduce round trips:
```typescript
const BATCH_SIZE = 1000
const changes = getUnsyncedChanges(BATCH_SIZE)
await syncBatch(changes)
```
### Hash-Based Change Detection
```typescript
// Only sync if hash differs
const localHash = calculateHash(localEntity)
const serverHash = getServerHash(entityId)
if (localHash !== serverHash) {
syncEntity(localEntity)
}
```
### Compression
Large payloads compressed before transmission:
```typescript
// Server sends compressed response
res.setHeader('Content-Encoding', 'gzip')
res.send(gzip(syncData))
```
## Error Handling
### Network Errors
Reported to the user and the sync will be retried after the interval passes.
### Sync Integrity Checks
**Hash Verification:**
```typescript
// Verify entity hash matches
const calculatedHash = calculateHash(entity)
const receivedHash = entityChange.hash
if (calculatedHash !== receivedHash) {
throw new Error('Hash mismatch - data corruption detected')
}
```
**Consistency Checks:**
* Orphaned branches detection
* Missing parent notes
* Invalid entity references
* Circular dependencies
## Sync Server Configuration
### Server Setup
**Required Options:**
```javascript
{
"syncServerHost": "https://sync.example.com",
"syncServerTimeout": 60000,
"syncProxy": "" // Optional HTTP proxy
}
```
**Authentication:**
* Username/password or
* Sync token (generated on server)
## Sync API Endpoints
Located at: `apps/server/src/routes/api/sync.ts`
## WebSocket Sync Updates
Real-time sync via WebSocket:
```typescript
// Server broadcasts change to all connected clients
ws.broadcast('frontend-update', {
lastSyncedPush,
entityChanges
})
// Client receives and processed the information.
```
## Sync Scheduling
### Automatic Sync
**Desktop:**
* Sync on startup
* Periodic sync (configurable interval, default: 60s)
**Server:**
* Sync on entity modification
* WebSocket push to connected clients
### Manual Sync
User can trigger:
* Full sync
* Sync now
* Sync specific subtree
## Troubleshooting
### Common Issues
**Sync stuck:**
```
-- Reset sync state
UPDATE entity_changes SET isSynced = 0;
DELETE FROM options WHERE name LIKE 'sync%';
```
**Hash mismatch:**
* Data corruption detected
* Re-sync from backup
* Check database integrity
**Conflict loop:**
* Manual intervention required
* Export conflicting notes
* Choose winning version
* Re-sync
## Security Considerations
### Encrypted Sync
* Protected notes synced encrypted
* No plain text over network
* Server cannot read protected content
### Authentication
* Username/password over HTTPS only
* Sync tokens for token-based auth
* Session cookies with CSRF protection
### Authorization
* Users can only sync their own data
* No cross-user sync support
* Sync server validates ownership
## Performance Metrics
**Typical Sync Performance:**
* 1000 changes: ~2-5 seconds
* 10000 changes: ~20-50 seconds
* Initial full sync (100k notes): ~5-10 minutes
**Factors:**
* Network latency
* Database size
* Number of protected notes
* Attachment sizes