mirror of
https://github.com/hcengineering/platform.git
synced 2026-08-20 03:15:41 +02:00
+1








98652c6476
* Add bump-changes * Add utility tests * Add utility tests * Bump to new version of esbuild and typescript * v0.7.3 * use platform rig 0.7.10 * upgrade: memory engine optimized; change name to (was recommended by Copilot and Onnikov, TODO: CHANGE CLIENT TOO!!!) Signed-off-by: Leonid Kaganov <lleo@lleo.me> * Fix rate limits bug * Bump versions * Fix lock file * Fix bug in queue cleanup * Add more tests for queue * Add api-test tests * Initial commit * Improve hierarchy + tests Add tests for hierarchy and few performance/memory optimizations. * Add more hierarchy tests * Move from Huly platform repository * Add docker tests setup * Fix test to be executed only once * Add connection tests * Fix package include source files * More tests * Create README.md * Fix pnpm lock * Fix packages publish * Remove broken tests * feat: adjust hulylake client for storage adapter Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Fix export * Fix publish * Fix message update (#114) Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com> * Bump version Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com> * Bump versions Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Fix lang store (#115) Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com> * update hulylake client Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Bump version Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Add hulylake storage adapter Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Bump version Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * fix validation issues Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * fix: do not fail on deseralization error and add logs Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * bump version -> 0.1.14 Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * fix collaboration test Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Update prettier and new update-deps script Prettier + svelte support * fix unstable ydoc tests Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Add tx ordering middleware * Fix ordering tests * Fix Kafka close of admin * Add tests for measurement and understand overhead * Fix not updated lock file * Fix update-deps * Fix update-deps * Use latest platform-rig * Fix deps * Add rush check to CI * Use latest versions * Bump versions * Fix lock file * validate json patch Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * bump version -> 0.1.15 Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * fix merge unit tests Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Script to sync eslint deps * Fix deps * Fix tests * Fix platform-rig detection * Update to latest platform-rig * Update to latest platform rig and core * Bump typescript * Bump typescript * Rollback eslint plugins * Fix lock file * Bump platform-rig * Update to latest platform-rig * update to latest platform-rig * Allow to compile svelte files * Add ui-test component for checking compile * Fix log levels rename compile ui -> compile ui-esbuild * Fix build * Bump esbuild svelte version * Chore: use fixed versions in update-deps Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com> * Chore: commit changes Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com> * Update deps * Add tests for session manager * Fix txOrdering implementation * Bump ordering * Prevent metrics zero values in measure + Fix format svelte files * Revert update-deps script logic * v0.7.19 * update to latest platform-rig * Update deps * Fix pnpm * Session counters * Fix pnpm lock * Add storage client Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Bump versions Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * fix versions Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Bump core * Fix pnpm * Get rid of communication dependency * Add copilot memory file * Use proper name for instructions file * Fix instructions * Use domain instead of test name in gauges * Update instructions file * fix front service upload Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * remove incorrect test Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Move packages to huly.core * Move packages to core, since they are not utils * Add global user profile Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com> * Fix lock file Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com> * Add support for memory limit check * Bump version * Fix pnpm * report more accurate upload progress Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * fic validation issues Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Fix deps Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com> * Move LowLevelStorage to server * Fix linting * Revert "Fix linting" This reverts commit54631d353e. * Revert "Move LowLevelStorage to server" This reverts commitaafb8f6f12. * feature: add regorus engine with permit file Signed-off-by: Leonid Kaganov <lleo@lleo.me> * Fix one second counters for memory usage * Fix kafka test * use fresh core * Version bump * fix: key parameter added Signed-off-by: Leonid Kaganov <lleo@lleo.me> * Fix readme and few author mistakes * Export domain schemas * Bump version * Tests (#117) Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com> * Bump version Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com> * feat: compact compact worker (#4) Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * bump version -> 0.1.16 Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Add TypeIdentifier Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> * Add change logs Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> * rename send -> try_send Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Bump Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> * Fix pnpm lock Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> * Add identifier middleware, bump core Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> * Add subsciption methods to account client Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com> * Fix lock file Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com> * Fix reaction notification (#118) Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com> * Bump version Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com> * Improve find methods schemas to convert to valid types Signed-off-by: Nikolay Marchuk <nikolay.marchuk@hardcoreeng.com> * Add change description Signed-off-by: Nikolay Marchuk <nikolay.marchuk@hardcoreeng.com> * Do not transcode while recording Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Open telemetry support Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * use proper content type in multipart upload Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Bump versions Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * fix build (#26) Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Fix peers (#120) Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com> * Bump version Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com> * Add ActivityCollaborativeChange Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> * Update pnpm Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> * Allow to suspend errors on with * Fix pnpm cache * update versions * v0.7.17 for all * v0.7.11 * v0.7.14 * remove arc from worker Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * bump version -> 0.1.17 Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Rank for attributes Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> * Update pnpm Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> * Fix one second counters * Fix withContext and allow pass options * Fix formatting * Use updated deps * Bump versions * Update deps * Update deps to platform.core * add support for textColor mark Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * add support for textStyle mark Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Bump versions Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Bump versions again Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Fix Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> * Rework on second timers * fix merge of large blobs feched from s3 Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * bump version -> 0.1.18 Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * New subscription methods in account-client * Update lock file Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com> * Send error on find for wrong domain * Suspend connect custom errors events in traces * Bump client * Bump core * update deps * Fix lock file * Sorting for TypeIdentifier Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> * Bump version Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> * add workspace usage info Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Bump versions Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Improve pg security perfomance Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> * Fix identifier middleware Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> * Update TxAccessLevel interface Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com> * Allow guest to update its identities Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com> * Add password login locked platform status Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com> * Fix Uptrace normalizeMarkdown errors Signed-off-by: Artem Savchenko <armisav@gmail.com> * Add change log Signed-off-by: Artem Savchenko <armisav@gmail.com> * Add txMatch to permission Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> * update pnpm lock Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> * Bump Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> * Fix permission middleware Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> * Fix enum sorting Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> * Enable formatting check Signed-off-by: Andrey Sobolev <haiodo@gmail.com> * Enable formatting check * Add change Signed-off-by: Andrey Sobolev <haiodo@gmail.com> * Fix Uptrace NaN error Signed-off-by: Artem Savchenko <armisav@gmail.com> * feature: removed actors, improved performance Signed-off-by: Leonid Kaganov <lleo@lleo.me> * feature: ping from server to clients added Signed-off-by: Leonid Kaganov <lleo@lleo.me> * feature: ping from server to clients added Signed-off-by: Leonid Kaganov <lleo@lleo.me> * Compress kafka messages and fix exception in findAll Signed-off-by: Artem Savchenko <armisav@gmail.com> * Bump versions Signed-off-by: Artem Savchenko <armisav@gmail.com> * Bump versions Signed-off-by: Artem Savchenko <armisav@gmail.com> * Rush change Signed-off-by: Artem Savchenko <armisav@gmail.com> * Fix compression param Signed-off-by: Artem Savchenko <armisav@gmail.com> * Trigger change Signed-off-by: Artem Savchenko <armisav@gmail.com> * Clean up Signed-off-by: Artem Savchenko <armisav@gmail.com> * Trigger change Signed-off-by: Artem Savchenko <armisav@gmail.com> * Bump markdown version Signed-off-by: Artem Savchenko <armisav@gmail.com> * Enable sub projects * Fix wrong double symbol scripts * Include foundation packages * Add support for custom exclude filters Add support for custom exclude filters - by Andrey Sobolev - haiodo@gmail.com Signed-off-by: Andrey Sobolev <haiodo@gmail.com> * Bump Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> * Fix Uptrace filter is not a function error Signed-off-by: Artem Savchenko <armisav@gmail.com> * Sync versions Signed-off-by: Andrey Sobolev <haiodo@gmail.com> --------- Signed-off-by: Leonid Kaganov <lleo@lleo.me> Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com> Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com> Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> Signed-off-by: Nikolay Marchuk <nikolay.marchuk@hardcoreeng.com> Signed-off-by: Artem Savchenko <armisav@gmail.com> Signed-off-by: Andrey Sobolev <haiodo@gmail.com> Co-authored-by: Leonid Kaganov <lleo@lleo.me> Co-authored-by: Alexander Onnikov <Alexander.Onnikov@xored.com> Co-authored-by: Alexander Onnikov <Alexander.Onnikov@gmail.com> Co-authored-by: Kristina <kristin.fefelova@gmail.com> Co-authored-by: Alexey Zinoviev <alexey.zinoviev@xored.com> Co-authored-by: Denis Bykhov <bykhov.denis@gmail.com> Co-authored-by: Nikolay Marchuk <nikolay.marchuk@hardcoreeng.com> Co-authored-by: Alexander Onnikov <aonnikov@hardcoreeng.com> Co-authored-by: Artem Savchenko <armisav@gmail.com>
249 lines
7.4 KiB
Markdown
249 lines
7.4 KiB
Markdown
# TxOrderingMiddleware Implementation
|
|
|
|
## Overview
|
|
|
|
The `TxOrderingMiddleware` ensures that transactions for the same document are broadcasted to clients in the correct order, preventing race conditions that cause unnecessary `getCurrentDoc` calls.
|
|
|
|
## Problem Description
|
|
|
|
### The Race Condition
|
|
|
|
When multiple transactions for the same document are processed concurrently:
|
|
|
|
1. **Transaction 1** arrives with `modifiedOn=101`
|
|
2. **Transaction 2** arrives with `modifiedOn=102`
|
|
3. Due to network/processing delays, tx2's `handleBroadcast()` might complete before tx1's
|
|
4. Client receives tx2 first, then tx1
|
|
5. Client's LiveQuery sees out-of-order transactions and calls `getCurrentDoc` unnecessarily
|
|
|
|
This was confirmed in the unit test `liveQuery.race.test.ts`.
|
|
|
|
## Solution Design
|
|
|
|
### Key Insights from `client.ts`
|
|
|
|
Looking at how transactions flow in `client.ts`:
|
|
|
|
```typescript
|
|
async txRaw(ctx: ClientSessionCtx, tx: Tx): Promise<{...}> {
|
|
// 1. Process transaction
|
|
result = await ctx.pipeline.tx(ctx.ctx, [tx])
|
|
|
|
// 2. Send result to client
|
|
await ctx.sendResponse(ctx.requestId, result)
|
|
|
|
// 3. Broadcast to other clients (returns promise)
|
|
const broadcastPromise = ctx.pipeline.handleBroadcast(ctx.ctx)
|
|
|
|
return { result, broadcastPromise, asyncsPromise }
|
|
}
|
|
```
|
|
|
|
The critical observation: Multiple `txRaw()` calls can be in-flight simultaneously, and their `handleBroadcast()` promises may resolve out-of-order.
|
|
|
|
### Two-Phase Approach
|
|
|
|
#### Phase 1: `tx()` - Record Transaction Order
|
|
|
|
When a transaction is processed:
|
|
|
|
1. Extract the target document ID from the transaction
|
|
2. Create a promise that will be resolved when this tx's broadcast completes
|
|
3. Store the transaction entry in a queue: `Map<docId, TxOrderEntry[]>`
|
|
|
|
```typescript
|
|
interface TxOrderEntry {
|
|
txId: string
|
|
modifiedOn: number
|
|
broadcastPromise?: Promise<void>
|
|
broadcastResolve?: () => void
|
|
}
|
|
```
|
|
|
|
#### Phase 2: `handleBroadcast()` - Wait Before Broadcasting
|
|
|
|
When broadcasting transactions:
|
|
|
|
1. For each transaction in the broadcast, find all previous transactions for the same document
|
|
2. Wait for all previous broadcasts to complete: `await Promise.all(waitPromises)`
|
|
3. Call the next middleware's `handleBroadcast()` to perform actual broadcast
|
|
4. Resolve this transaction's promise to signal completion
|
|
5. Remove the transaction from the queue
|
|
|
|
### Example Scenario
|
|
|
|
```
|
|
Time | Thread 1 (tx1, modifiedOn=101) | Thread 2 (tx2, modifiedOn=102)
|
|
------|-------------------------------------|-----------------------------------
|
|
T1 | tx() called |
|
|
| - Create promise1 |
|
|
| - Queue: [tx1] |
|
|
------|-------------------------------------|-----------------------------------
|
|
T2 | | tx() called
|
|
| | - Create promise2
|
|
| | - Queue: [tx1, tx2]
|
|
------|-------------------------------------|-----------------------------------
|
|
T3 | | handleBroadcast() called
|
|
| | - Find tx1 before tx2
|
|
| | - await promise1 (BLOCKS)
|
|
------|-------------------------------------|-----------------------------------
|
|
T4 | handleBroadcast() called |
|
|
| - No previous txes | (still waiting on promise1)
|
|
| - Broadcast tx1 |
|
|
| - Resolve promise1 |
|
|
| - Remove tx1 from queue |
|
|
------|-------------------------------------|-----------------------------------
|
|
T5 | | promise1 resolved, continues
|
|
| | - Broadcast tx2
|
|
| | - Resolve promise2
|
|
| | - Remove tx2 from queue
|
|
```
|
|
|
|
## Implementation Details
|
|
|
|
### Data Structure
|
|
|
|
```typescript
|
|
private readonly docTxQueue = new Map<Ref<Doc>, TxOrderEntry[]>()
|
|
```
|
|
|
|
- **Key**: Document ID
|
|
- **Value**: Array of transaction entries in order of arrival
|
|
- Automatically cleaned up when queues are empty
|
|
|
|
### Memory Management
|
|
|
|
To prevent memory leaks:
|
|
|
|
1. Remove transactions from queue after broadcast completes
|
|
2. Delete empty queues
|
|
3. If a queue grows beyond 1000 entries, remove oldest entries (with safety resolution)
|
|
|
|
### Key Methods
|
|
|
|
#### `tx(ctx, txes)`
|
|
|
|
Records transaction order:
|
|
|
|
```typescript
|
|
for (const tx of txes) {
|
|
const docId = this.getTargetDocId(tx)
|
|
if (docId !== undefined) {
|
|
let queue = this.docTxQueue.get(docId)
|
|
if (queue === undefined) {
|
|
queue = []
|
|
this.docTxQueue.set(docId, queue)
|
|
}
|
|
|
|
// Create promise for this transaction's broadcast
|
|
let broadcastResolve
|
|
const broadcastPromise = new Promise<void>((resolve) => {
|
|
broadcastResolve = resolve
|
|
})
|
|
|
|
queue.push({
|
|
txId: tx._id,
|
|
modifiedOn: tx.modifiedOn,
|
|
broadcastPromise,
|
|
broadcastResolve
|
|
})
|
|
}
|
|
}
|
|
```
|
|
|
|
#### `handleBroadcast(ctx)`
|
|
|
|
Enforces order and waits:
|
|
|
|
```typescript
|
|
const waitPromises: Promise<void>[] = []
|
|
|
|
for (const tx of txes) {
|
|
const queue = this.docTxQueue.get(docId)
|
|
const txIndex = queue.findIndex((entry) => entry.txId === tx._id)
|
|
|
|
// Wait for all previous transactions
|
|
for (let i = 0; i < txIndex; i++) {
|
|
const prevEntry = queue[i]
|
|
if (prevEntry.broadcastPromise !== undefined) {
|
|
waitPromises.push(prevEntry.broadcastPromise)
|
|
}
|
|
}
|
|
}
|
|
|
|
// Block until all previous broadcasts complete
|
|
await Promise.all(waitPromises)
|
|
|
|
// Now broadcast this transaction
|
|
await this.next?.handleBroadcast(ctx)
|
|
|
|
// Mark as complete
|
|
for (const tx of txes) {
|
|
// Resolve promise and remove from queue
|
|
entry.broadcastResolve()
|
|
queue.splice(txIndex, 1)
|
|
}
|
|
```
|
|
|
|
## Testing
|
|
|
|
### Unit Tests (`txOrdering.test.ts`)
|
|
|
|
1. **Basic ordering**: Verify out-of-order transactions are broadcasted in correct sequence
|
|
2. **Multiple documents**: Ensure independent ordering per document
|
|
3. **Concurrent broadcasts**: Test that later transactions wait for earlier ones
|
|
4. **Statistics tracking**: Verify queue size monitoring
|
|
5. **Memory cleanup**: Confirm transactions removed after broadcast
|
|
|
|
### Integration Test
|
|
|
|
Simulates the full pipeline flow with mocked next middleware.
|
|
|
|
## Performance Considerations
|
|
|
|
### Overhead
|
|
|
|
- **Memory**: O(N) where N is number of in-flight transactions per document
|
|
- **CPU**: O(M) where M is position in queue (typically small)
|
|
|
|
### Benefits
|
|
|
|
- Prevents unnecessary `getCurrentDoc` calls on client
|
|
- Reduces database load
|
|
- Improves client-side responsiveness
|
|
|
|
### Scalability
|
|
|
|
- Independent ordering per document (no global locks)
|
|
- Automatic cleanup prevents memory leaks
|
|
- Works with any number of concurrent transactions
|
|
|
|
## Deployment
|
|
|
|
### Adding to Pipeline
|
|
|
|
In your middleware configuration:
|
|
|
|
```typescript
|
|
import { TxOrderingMiddleware } from '@hcengineering/middleware'
|
|
|
|
const pipeline = [
|
|
// ... other middleware
|
|
TxOrderingMiddleware.create()
|
|
// ... more middleware
|
|
]
|
|
```
|
|
|
|
## Future Enhancements
|
|
|
|
1. **Configurable queue size limit**: Currently hardcoded to 1000
|
|
2. **Metrics integration**: Export stats to monitoring system
|
|
3. **Timeout handling**: Add timeout for stuck broadcasts
|
|
4. **Priority-based ordering**: Allow high-priority transactions to bypass queue
|
|
|
|
## Related Documents
|
|
|
|
- `/docs/livequery-race-condition-analysis.md` - Detailed problem analysis
|
|
- `/packages/middleware/src/tests/liveQuery.race.test.ts` - Original race condition test
|
|
- `/packages/middleware/src/tests/txOrdering.test.ts` - Middleware unit tests
|