Skip to content

armgit / ruflo

Public Imported from GitHub
0

🌊 The original agent harness. Deploy intelligent multi-player swarms, coordinate autonomous workflows, and build conversational AI systems. Features adaptive memory, self-learning intelligence, federation, vector RAG integration, and native Claude Code / Codex / Hermes and many more Integrated

fix(x-gateway): claims reducer honours ttlSeconds — expired leases free the resource (#3292)

rUv4bb9ca182dc8
diff --git a/plugins/ruflo-x-gateway/node_modules b/plugins/ruflo-x-gateway/node_modules
deleted file mode 120000
index 0fabcd9e26..0000000000
--- a/plugins/ruflo-x-gateway/node_modules
+++ /dev/null
@@ -1 +0,0 @@
-/private/tmp/claude-501/-Users-cohen-Projects-ruflo/655cdb4f-b1d0-436a-9259-3bfdb013c450/scratchpad/gw/plugins/ruflo-x-gateway/node_modules
\ No newline at end of file
diff --git a/plugins/ruflo-x-gateway/src/claims.mjs b/plugins/ruflo-x-gateway/src/claims.mjs
index b17f427454..c656e17e96 100644
--- a/plugins/ruflo-x-gateway/src/claims.mjs
+++ b/plugins/ruflo-x-gateway/src/claims.mjs
@@ -1,11 +1,25 @@
// Owner-per-resource ledger reduced from claim events (oldest first).
-export function reduceClaims(events) {
+//
+// A claim with ttlSeconds expires at created_at + ttlSeconds. An expired claim is not an
+// owner: it is dropped from the ledger, and a later ClaimIssued for the same resource wins.
+// Expiry is evaluated against the later event's own timestamp while reducing (so history
+// replays deterministically) and against `now` for the final ledger (so a resource whose
+// owner disconnected without releasing frees itself once the lease runs out).
+const expiresAt = (c) => (c.ttlSeconds > 0 ? c.issuedAt + c.ttlSeconds : Infinity);
+export function reduceClaims(events, now = Math.floor(Date.now() / 1000)) {
const byRes = {};
for (const e of [...events].sort((a, b) => a.created_at - b.created_at)) {
const r = e.resourceId; if (!r) continue;
- if (e.type === 'ClaimIssued') { if (!byRes[r]) byRes[r] = { owner: e.pubkey, from: e.from, at: e.ts, ttlSeconds: e.ttlSeconds }; }
- else if (e.type === 'ClaimReleased') { if (byRes[r]?.owner === e.pubkey) delete byRes[r]; }
+ const cur = byRes[r];
+ if (cur && expiresAt(cur) <= e.created_at) delete byRes[r];
+ if (e.type === 'ClaimIssued') {
+ if (!byRes[r]) byRes[r] = { owner: e.pubkey, from: e.from, at: e.ts, ttlSeconds: e.ttlSeconds, issuedAt: e.created_at };
+ } else if (e.type === 'ClaimReleased') { if (byRes[r]?.owner === e.pubkey) delete byRes[r]; }
else if (e.type === 'ClaimHandoff') { if (byRes[r]?.owner === e.pubkey && e.toNode) byRes[r].owner = e.toNode; }
}
+ for (const [r, c] of Object.entries(byRes)) {
+ if (expiresAt(c) <= now) delete byRes[r];
+ else { c.expiresAt = Number.isFinite(expiresAt(c)) ? new Date(expiresAt(c) * 1000).toISOString() : null; delete c.issuedAt; }
+ }
return byRes;
}
diff --git a/plugins/ruflo-x-gateway/test/gateway.test.mjs b/plugins/ruflo-x-gateway/test/gateway.test.mjs
index ce1b128c68..3286c693d6 100644
--- a/plugins/ruflo-x-gateway/test/gateway.test.mjs
+++ b/plugins/ruflo-x-gateway/test/gateway.test.mjs
@@ -17,6 +17,19 @@ test('claims: release by owner frees; release by non-owner ignored', () => {
assert.deepEqual(reduceClaims([ev('ClaimIssued', 'A', 'r1', 1), ev('ClaimReleased', 'A', 'r1', 2)]), {});
assert.equal(reduceClaims([ev('ClaimIssued', 'A', 'r1', 1), ev('ClaimReleased', 'B', 'r1', 2)]).r1.owner, 'A');
});
+test('claims: ttl expiry frees the resource and lets a later claim win', () => {
+ // A claims at t=10 with a 60s lease; B claims at t=100 (after expiry) -> B owns it.
+ const l = reduceClaims([ev('ClaimIssued', 'A', 'r1', 10, { ttlSeconds: 60 }), ev('ClaimIssued', 'B', 'r1', 100, { ttlSeconds: 600 })], 150);
+ assert.equal(l.r1.owner, 'B'); assert.equal(l.r1.ttlSeconds, 600); assert.ok(l.r1.expiresAt);
+ // A's lease still live when B claims -> A keeps it.
+ assert.equal(reduceClaims([ev('ClaimIssued', 'A', 'r1', 10, { ttlSeconds: 600 }), ev('ClaimIssued', 'B', 'r1', 100)], 150).r1.owner, 'A');
+ // Disconnected worker: lease expired relative to `now`, nobody released -> resource is free.
+ assert.deepEqual(reduceClaims([ev('ClaimIssued', 'A', 'r1', 10, { ttlSeconds: 60 })], 200), {});
+ // No ttl -> never expires.
+ assert.equal(reduceClaims([ev('ClaimIssued', 'A', 'r1', 10)], 10_000_000).r1.owner, 'A');
+ // A release of an already-expired claim is a no-op, not an error.
+ assert.deepEqual(reduceClaims([ev('ClaimIssued', 'A', 'r1', 10, { ttlSeconds: 60 }), ev('ClaimReleased', 'A', 'r1', 500)], 600), {});
+});
test('claims: handoff only by current owner', () => {
assert.equal(reduceClaims([ev('ClaimIssued', 'A', 'r1', 1), ev('ClaimHandoff', 'A', 'r1', 2, { toNode: 'C' })]).r1.owner, 'C');
assert.equal(reduceClaims([ev('ClaimIssued', 'A', 'r1', 1), ev('ClaimHandoff', 'B', 'r1', 2, { toNode: 'C' })]).r1.owner, 'A');