@zlink-systems/framework 0.29.1 → 0.30.1

package/dist/runtime/locations/location-store-repository.js

@@ -2,10 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZLinkLocationStoreRepository = void 0;
 const service_relocation_runtime_1 = require("../foundation/service-relocation-runtime");
+const service_authority_payload_codec_1 = require("../foundation/service-authority-payload-codec");
+const actor_authority_payload_codec_1 = require("../actors/actor-authority-payload-codec");
+const contracts_1 = require("../../contracts");
 const stream_wire_1 = require("@zlink-systems/stream-wire");
 const node_crypto_1 = require("node:crypto");
 const Options_1 = require("../../contracts/Locations/Options");
-const contracts_1 = require("../../contracts");
+const contracts_2 = require("../../contracts");
 const CoreTypes_1 = require("../../contracts/Common/CoreTypes");
 const InternalDefaults_1 = require("../../contracts/Configuration/InternalDefaults");
 const RegistrationBuilderPolicy_1 = require("../../contracts/Configuration/RegistrationBuilderPolicy");
@@ -215,9 +218,27 @@ class ZLinkLocationStoreRepository extends in_memory_location_store_1.ZLinkInMem
                         payload: Buffer.from(mutation.payload)
                     }
                 };
+            const actor = mutation.kind !== 'delete' && record.snapshot.allocation.objectKind === 'actor'
+                ? (0, actor_authority_payload_codec_1.decodeActorAuthorityPayload)((0, service_relocation_runtime_1.serviceRelocationAuthorityApplicationPayload)(mutation.payload))
+                : undefined;
+            const previousActor = actor === undefined
+                ? undefined
+                : (0, actor_authority_payload_codec_1.decodeActorAuthorityPayload)((0, service_relocation_runtime_1.serviceRelocationAuthorityApplicationPayload)(record.snapshot.payload));
+            const membershipConditions = actor?.currentSpotKind === contracts_1.ZLinkSpotKind.User &&
+                (previousActor?.currentSpotKind !== contracts_1.ZLinkSpotKind.User ||
+                    previousActor.currentSpotId !== actor.currentSpotId ||
+                    previousActor.currentSpotGeneration !== actor.currentSpotGeneration)
+                ? await this.userSpotMembershipConditions(actor.currentSpotId, actor.currentSpotGeneration, signal, {
+                    ownerId: record.snapshot.ownerId,
+                    leaseGeneration: record.snapshot.ownerLeaseGeneration
+                })
+                : [];
+            if (membershipConditions === undefined)
+                return { kind: 'conflict', current: snapshot };
             const result = await this.provider.write({
                 conditions: [
                     { kind: 'version', key: rowKey, expected: current.value.version },
+                    ...membershipConditions,
                     ...(mutation.kind === 'restore'
                         ? []
                         : [
@@ -654,7 +675,7 @@ class ZLinkLocationStoreRepository extends in_memory_location_store_1.ZLinkInMem
                     sha256Hex(membership) !== entry.membershipMutationSha256) {
                     throw new Error('Aggregate participant staging checksum does not match inventory.');
                 }
-                authorityRows.push({ key: rowKeyForParticipant, current, record, entry });
+                authorityRows.push({ key: rowKeyForParticipant, current, record, entry, payload });
             }
             const targetDescriptorKey = meshKey(aggregate.targetDescriptor.meshName, aggregate.targetDescriptor.rid);
             const targetLeaseKey = ownerKey(aggregate.targetOwner.ownerId);
@@ -717,11 +738,34 @@ class ZLinkLocationStoreRepository extends in_memory_location_store_1.ZLinkInMem
                     bytes: encodeJson(capacity)
                 });
             }
+            const membershipConditions = [];
+            for (const row of authorityRows) {
+                if (row.record.snapshot.allocation.objectKind !== 'actor')
+                    continue;
+                const actor = (0, actor_authority_payload_codec_1.decodeActorAuthorityPayload)((0, service_relocation_runtime_1.serviceRelocationAuthorityApplicationPayload)(row.payload));
+                if (actor?.currentSpotKind !== contracts_1.ZLinkSpotKind.User)
+                    continue;
+                const spotKey = (0, authority_key_codec_1.encodeAuthorityKey)('user_spot', actor.currentSpotId);
+                const participantSpot = authorityRows.find((candidate) => candidate.entry.authorityKey === spotKey.value);
+                if (participantSpot !== undefined) {
+                    if (participantSpot.record.snapshot.allocation.objectKind !== 'user_spot' ||
+                        participantSpot.record.snapshot.objectGeneration !== actor.currentSpotGeneration)
+                        return { kind: 'stale' };
+                    continue;
+                }
+                if (membershipConditions.some((condition) => condition.key.value === authorityKey(spotKey.value).value))
+                    continue;
+                const conditions = await this.userSpotMembershipConditions(actor.currentSpotId, actor.currentSpotGeneration, signal, aggregate.targetOwner);
+                if (conditions === undefined)
+                    return { kind: 'stale' };
+                membershipConditions.push(...conditions.filter((condition) => !membershipConditions.some((existing) => existing.key.value === condition.key.value)));
+            }
             const published = await this.provider.write({
                 conditions: [
                     { kind: 'version', key: rowKey, expected: aggregateRead.value.version },
                     versionCondition(targetDescriptorKey, descriptorRead),
                     leaseValueCondition(targetLeaseKey, aggregate.targetOwner),
+                    ...membershipConditions,
                     ...[...capacityReads.entries()].map(([value, read]) => ({
                         kind: 'version',
                         key: capacityKeys.get(value),
@@ -814,8 +858,9 @@ class ZLinkLocationStoreRepository extends in_memory_location_store_1.ZLinkInMem
             return { kind: 'aborted' };
         }
     }
-    async releaseEndedReservation(key, expectedStoreVersion, signal) {
-        return ((await this.tryReleaseEndedReservation(key, expectedStoreVersion, signal)) === 'reclaimed');
+    async releaseEndedReservation(key, expectedStoreVersion, signal, request) {
+        return ((await this.tryReleaseEndedReservation(key, expectedStoreVersion, signal, request)) ===
+            'reclaimed');
     }
     async tryReleaseEndedReservation(key, expectedStoreVersion, signal, request) {
         const rowKey = authorityKey(key.value);
@@ -824,11 +869,9 @@ class ZLinkLocationStoreRepository extends in_memory_location_store_1.ZLinkInMem
             return 'conflict';
         const record = decodeAuthorityRecord(current.value.bytes);
         const snapshot = record.snapshot;
-        if ((snapshot.allocation.state === 'active'
-            ? request?.key.kind !== 'actor'
-            : snapshot.pendingCreation === undefined) ||
-            record.aggregate !== undefined ||
-            hasRelocationAuthority(snapshot.payload))
+        if (snapshot.allocation.state === 'active'
+            ? request === undefined
+            : snapshot.pendingCreation === undefined)
             return 'notReclaimable';
         const leaseKey = ownerKey(snapshot.ownerId);
         const descriptorKey = meshKey(snapshot.allocation.descriptor.meshName, snapshot.allocation.descriptor.rid);
@@ -844,13 +887,62 @@ class ZLinkLocationStoreRepository extends in_memory_location_store_1.ZLinkInMem
         if (snapshot.allocation.state === 'active') {
             if (ownerLive)
                 return 'notReclaimable';
-            if (request?.actorRelocationPolicy !== 'disabled')
-                throw new contracts_1.ZLinkFrameworkException(contracts_1.ZLinkFrameworkErrorKind.Unavailable, 'Actor owner lease is unavailable.');
+            let unavailable = record.aggregate !== undefined || hasRelocationAuthority(snapshot.payload);
+            if (snapshot.allocation.objectKind !== 'actor') {
+                const spot = (0, service_authority_payload_codec_1.decodeServiceReadySpotAuthority)(snapshot.payload);
+                unavailable ||=
+                    spot === undefined ||
+                        spot.kind !== request?.key.kind ||
+                        spot.stableType !== request.intent.stableType ||
+                        spot.spotId !== request.key.globalId ||
+                        spot.activationRecovery !== undefined;
+                if (spot?.kind === 'user_spot') {
+                    // The snapshot starts only after the old owner's lease was found invalid.
+                    for (const prefix of [`${PREFIX}actor:`, `${AUTHORITY_PREIMAGE_PREFIX}actor\0`]) {
+                        membershipSnapshot: for (;;) {
+                            let snapshotHasMember = false;
+                            let cursor;
+                            do {
+                                const page = await this.provider.scan({ prefix, cursor, limit: Stores_1.ZLINK_PROVIDER_MAX_PAGE_SIZE }, signal);
+                                if (page.kind === 'expired')
+                                    continue membershipSnapshot;
+                                for (const item of page.value.items) {
+                                    if (prefix === `${PREFIX}actor:`) {
+                                        const actor = normalizeActor(decodeJson(item.value.bytes).descriptor);
+                                        snapshotHasMember ||=
+                                            actor.spotKind === contracts_1.ZLinkSpotKind.User &&
+                                                String(actor.spotId) === spot.spotId &&
+                                                actor.spotGeneration === snapshot.objectGeneration;
+                                    }
+                                    else {
+                                        const authority = decodeAuthorityRecord(item.value.bytes).snapshot;
+                                        if (authority.allocation.objectKind !== 'actor')
+                                            continue;
+                                        const actor = (0, actor_authority_payload_codec_1.decodeActorAuthorityPayload)((0, service_relocation_runtime_1.serviceRelocationAuthorityApplicationPayload)(authority.payload));
+                                        snapshotHasMember ||=
+                                            actor?.currentSpotKind === contracts_1.ZLinkSpotKind.User &&
+                                                actor.currentSpotId === spot.spotId &&
+                                                actor.currentSpotGeneration === snapshot.objectGeneration;
+                                    }
+                                }
+                                cursor = page.value.nextCursor;
+                            } while (cursor !== undefined);
+                            unavailable ||= snapshotHasMember;
+                            break;
+                        }
+                    }
+                }
+            }
+            if (unavailable || request?.actorRelocationPolicy !== 'disabled')
+                throw new contracts_2.ZLinkFrameworkException(contracts_2.ZLinkFrameworkErrorKind.Unavailable, 'Object owner lease is unavailable.');
         }
         else if (ownerLive &&
             descriptor.kind === 'found' &&
             reviveMeshDescriptor(decodeCanonicalDescriptorRecord(descriptor.value.bytes).descriptor).lifecycleGeneration === snapshot.allocation.descriptorLifecycleGeneration)
             return 'notReclaimable';
+        if (snapshot.allocation.state !== 'active' &&
+            (record.aggregate !== undefined || hasRelocationAuthority(snapshot.payload)))
+            return 'notReclaimable';
         const mutations = [
             { kind: 'delete', key: rowKey }
         ];
@@ -871,8 +963,8 @@ class ZLinkLocationStoreRepository extends in_memory_location_store_1.ZLinkInMem
                 });
             }
             catch (error) {
-                if (!(error instanceof contracts_1.ZLinkFrameworkException) ||
-                    error.kind !== contracts_1.ZLinkFrameworkErrorKind.DataLost)
+                if (!(error instanceof contracts_2.ZLinkFrameworkException) ||
+                    error.kind !== contracts_2.ZLinkFrameworkErrorKind.DataLost)
                     throw error;
                 const observed = await this.provider.read(rowKey, signal);
                 if (observed.kind === 'missing' ||
@@ -927,7 +1019,7 @@ class ZLinkLocationStoreRepository extends in_memory_location_store_1.ZLinkInMem
                 this.provider.read(leaseKey, signal)
             ]);
             const descriptor = liveTargetDescriptor(descriptorRead, leaseRead, request.target);
-            if (descriptor === undefined || descriptor.state !== contracts_1.ZLinkFrameworkRuntimeState.Serving) {
+            if (descriptor === undefined || descriptor.state !== contracts_2.ZLinkFrameworkRuntimeState.Serving) {
                 return { kind: 'conflict', current: { kind: 'missing', storeNow: current.storeNow } };
             }
             const [capacityRead, objectGenerationRead, authorityOwnerGenerationRead] = await Promise.all([
@@ -1204,6 +1296,14 @@ class ZLinkLocationStoreRepository extends in_memory_location_store_1.ZLinkInMem
             if (retentionMs <= 0) {
                 throw new RangeError('Creation terminal expiry must be the live operation deadline plus five minutes.');
             }
+            const actor = request.completion.kind === 'created'
+                ? (0, actor_authority_payload_codec_1.decodeActorAuthorityPayload)((0, service_relocation_runtime_1.serviceRelocationAuthorityApplicationPayload)(request.completion.readyPayload))
+                : undefined;
+            const membershipConditions = actor?.currentSpotKind === contracts_1.ZLinkSpotKind.User
+                ? await this.userSpotMembershipConditions(actor.currentSpotId, actor.currentSpotGeneration, signal, request.target.owner)
+                : [];
+            if (membershipConditions === undefined)
+                return { kind: 'stale' };
             const mutations = request.completion.kind === 'created'
                 ? [
                     {
@@ -1243,6 +1343,7 @@ class ZLinkLocationStoreRepository extends in_memory_location_store_1.ZLinkInMem
                 conditions: [
                     { kind: 'version', key: rowKey, expected: current.value.version },
                     { kind: 'missing', key: terminalRowKey },
+                    ...membershipConditions,
                     versionCondition(descriptorKey, descriptorRead),
                     leaseValueCondition(leaseKey, request.target.owner),
                     conditionFor(capacityRowKey, capacityRead)
@@ -1505,7 +1606,7 @@ class ZLinkLocationStoreRepository extends in_memory_location_store_1.ZLinkInMem
         return this.listOwnedLocations(`${PREFIX}spot:`, page, normalizeSpot, (value) => matchesSpot(value, filter), signal);
     }
     async updateActor(location, intent, signal) {
-        return this.updateOwnedLocation(actorKey(location.meshName, location.actorId), normalizeActor(location), intent, signal);
+        return this.updateOwnedLocation(actorKey(location.meshName, location.actorId), normalizeActor(location), intent, signal, location);
     }
     async removeActor(key, owner, signal) {
         return this.removeOwnedLocation(actorKey(key.meshName, key.actorId), owner, signal);
@@ -1874,7 +1975,37 @@ class ZLinkLocationStoreRepository extends in_memory_location_store_1.ZLinkInMem
             continuationToken: result.value.nextCursor?.value
         };
     }
-    async updateOwnedLocation(rowKey, location, intent, signal) {
+    async userSpotMembershipConditions(spotId, objectGeneration, signal, conditionedOwner) {
+        const key = authorityKey((0, authority_key_codec_1.encodeAuthorityKey)('user_spot', spotId).value);
+        const read = await this.provider.read(key, signal);
+        if (read.kind === 'missing')
+            return undefined;
+        const record = decodeAuthorityRecord(read.value.bytes);
+        const snapshot = record.snapshot;
+        if (record.aggregate !== undefined ||
+            snapshot.allocation.objectKind !== 'user_spot' ||
+            snapshot.allocation.state !== 'active' ||
+            snapshot.objectGeneration !== objectGeneration ||
+            (0, service_authority_payload_codec_1.decodeServiceReadySpotAuthority)(snapshot.payload)?.kind !== 'user_spot')
+            return undefined;
+        const leaseKey = ownerKey(snapshot.ownerId);
+        const lease = await this.provider.read(leaseKey, signal);
+        if (!sameLiveOwner(lease, snapshot))
+            return undefined;
+        return [
+            { kind: 'version', key, expected: read.value.version },
+            ...(conditionedOwner?.ownerId === snapshot.ownerId &&
+                conditionedOwner.leaseGeneration === snapshot.ownerLeaseGeneration
+                ? []
+                : [
+                    leaseValueCondition(leaseKey, {
+                        ownerId: snapshot.ownerId,
+                        leaseGeneration: snapshot.ownerLeaseGeneration
+                    })
+                ])
+        ];
+    }
+    async updateOwnedLocation(rowKey, location, intent, signal, membership) {
         const leaseKey = ownerKey(location.ownerId);
         const [lease, current] = await Promise.all([
             this.provider.read(leaseKey, signal),
@@ -1919,13 +2050,25 @@ class ZLinkLocationStoreRepository extends in_memory_location_store_1.ZLinkInMem
         else if (intent === 2) {
             return rejected(lease.value.storeNow);
         }
+        const previousMembership = current.kind === 'found' && membership !== undefined
+            ? decodeJson(current.value.bytes).descriptor
+            : undefined;
+        const membershipConditions = membership?.spotKind === contracts_1.ZLinkSpotKind.User &&
+            (previousMembership?.spotKind !== contracts_1.ZLinkSpotKind.User ||
+                String(previousMembership.spotId) !== String(membership.spotId) ||
+                BigInt(previousMembership.spotGeneration) !== membership.spotGeneration)
+            ? await this.userSpotMembershipConditions(String(membership.spotId), membership.spotGeneration, signal, { ownerId: location.ownerId, leaseGeneration: locationOwnerGeneration(location) })
+            : [];
+        if (membershipConditions === undefined)
+            return rejected(lease.value.storeNow);
         const result = await this.provider.write({
             conditions: [
                 leaseValueCondition(leaseKey, {
                     ownerId: location.ownerId,
                     leaseGeneration: locationOwnerGeneration(location)
                 }),
-                rowCondition
+                rowCondition,
+                ...membershipConditions
             ],
             mutations: [
                 {
@@ -2913,7 +3056,7 @@ function liveTargetDescriptor(descriptorRead, leaseRead, target) {
         descriptor.lifecycleGeneration === target.nodeLifecycleGeneration &&
         descriptor.ownerId === target.owner.ownerId &&
         descriptor.leaseGeneration === target.owner.leaseGeneration &&
-        descriptor.objectRole === contracts_1.ZLinkObjectRole.Server &&
+        descriptor.objectRole === contracts_2.ZLinkObjectRole.Server &&
         lease.ownerId === target.owner.ownerId &&
         BigInt(lease.leaseGeneration) === target.owner.leaseGeneration &&
         leaseRead.value.expiresAt !== undefined &&
@@ -2974,7 +3117,7 @@ function adjustCapacity(usage, delta, direction) {
         const key = capacityTypeKey(delta.spotType);
         const next = (spotTypes[key] ?? 0) + direction * delta.spotType.count;
         if (next < 0)
-            throw new contracts_1.ZLinkFrameworkException(contracts_1.ZLinkFrameworkErrorKind.DataLost, 'Provider capacity counter underflow.');
+            throw new contracts_2.ZLinkFrameworkException(contracts_2.ZLinkFrameworkErrorKind.DataLost, 'Provider capacity counter underflow.');
         if (next === 0)
             delete spotTypes[key];
         else
@@ -2983,7 +3126,7 @@ function adjustCapacity(usage, delta, direction) {
     const actors = usage.actors + direction * delta.actors;
     const spots = usage.spots + direction * delta.spots;
     if (actors < 0 || spots < 0)
-        throw new contracts_1.ZLinkFrameworkException(contracts_1.ZLinkFrameworkErrorKind.DataLost, 'Provider capacity counter underflow.');
+        throw new contracts_2.ZLinkFrameworkException(contracts_2.ZLinkFrameworkErrorKind.DataLost, 'Provider capacity counter underflow.');
     return { actors, spots, spotTypes };
 }
 function capacityTypeKey(value) {
@@ -3308,10 +3451,10 @@ function throwIfOperationExpired(signal, deadlineUnixMs) {
 }
 // Store SPI §6: preserve caller failures and classify provider failures once.
 function locationStoreProviderFailure(error, signal) {
-    if (error instanceof contracts_1.ZLinkFrameworkException ||
+    if (error instanceof contracts_2.ZLinkFrameworkException ||
         error instanceof TypeError ||
         error instanceof RangeError ||
         signal?.aborted === true)
         return error;
-    return new contracts_1.ZLinkFrameworkException(contracts_1.ZLinkFrameworkErrorKind.Unavailable, 'Location Store provider is unavailable.', error);
+    return new contracts_2.ZLinkFrameworkException(contracts_2.ZLinkFrameworkErrorKind.Unavailable, 'Location Store provider is unavailable.', error);
 }

package/dist/runtime/locations/resolvers.d.ts

@@ -1,6 +1,6 @@
 import type { ActorRef, RoutingId, SpotId } from '../../contracts/Common';
 import { type SpotHandle, type ZLinkActorSpotHandleResolver, type ZLinkSpotHandleResolver, type ResolvedSpotHandle } from '../spots/spot-handle';
-import type { ZLinkSpotRouteResolver, ZLinkSpotRouteTarget } from '../spots/spot-routing-internal';
+import type { ZLinkSpotRouteResolver, ZLinkSpotRouteTarget, ZLinkInstanceReactivationRoute } from '../spots/spot-routing-internal';
 import { ZLinkFrameworkRuntimeState, ZLinkLocationRole, type ZLinkActorLocation, type ZLinkActorLocationKey, type ZLinkLocationReadiness, type ZLinkLocationRuntimeQuery, type ZLinkPeerLocation, type ZLinkPeerLocationFilter, type ZLinkPeerLocationResolver, type ZLinkRouteLocation, type ZLinkRouteLocationKey, type ZLinkSpotLocation, type ZLinkSpotLocationKey } from './internal-location-contracts';
 import type { ZLinkActorLocationStore, ZLinkAuthorityStore, ZLinkMeshNodeLocationStore, ZLinkPeerLocationStore, ZLinkRouteLocationStore, ZLinkSpotLocationStore } from './internal-store-contracts';
 import { ZLinkOwnerLeaseTracker } from './lease-tracker';
@@ -135,6 +135,7 @@ export declare class ZLinkAuthoritySpotRouteResolver implements ZLinkSpotRouteRe
     private readonly routeEpochs;
     private readonly activeResolutions;
     constructor(store: ZLinkAuthorityStore, routerChannelIdForMesh: (meshName: string) => string, fallback?: ZLinkSpotRouteResolver | undefined, leaseTracker?: ZLinkOwnerLeaseTracker | undefined, routeCacheMaxAgeMs?: number, monotonicNowMs?: () => number, targetNodeStateResolver?: ((meshName: string, nodeRid: RoutingId, expectedLifecycleGeneration: bigint, signal?: AbortSignal) => Promise<ZLinkFrameworkRuntimeState | undefined>) | undefined);
+    resolve(spotId: RoutingId, signal: AbortSignal | undefined, instanceIntent: true): Promise<ZLinkSpotRouteTarget | ZLinkInstanceReactivationRoute>;
     resolve(spotId: RoutingId, signal?: AbortSignal): Promise<ZLinkSpotRouteTarget>;
     invalidate(spotId: RoutingId): void;
     private invalidateCore;

package/dist/runtime/locations/resolvers.js

@@ -583,7 +583,7 @@ class ZLinkAuthoritySpotRouteResolver {
         this.monotonicNowMs = monotonicNowMs;
         this.targetNodeStateResolver = targetNodeStateResolver;
     }
-    async resolve(spotId, signal) {
+    async resolve(spotId, signal, instanceIntent) {
         const key = String(spotId);
         const prepared = await this.lane.run(() => this.beginResolutionCore(key));
         try {
@@ -606,6 +606,15 @@ class ZLinkAuthoritySpotRouteResolver {
                             leaseGeneration: current.ownerLeaseGeneration
                         }, signal);
                     if (remainingLeaseMs !== undefined && remainingLeaseMs <= 0) {
+                        if (instanceIntent === true && ready?.kind === 'instance_spot') {
+                            return {
+                                kind: 'coldActivation',
+                                spotId,
+                                spotKind: Spots_1.ZLinkSpotKind.Instance,
+                                meshName: ready.ownerMeshName,
+                                stableType: ready.stableType
+                            };
+                        }
                         throw new Errors_1.ZLinkFrameworkException(Errors_1.ZLinkFrameworkErrorKind.Unavailable, `SPOT '${spotId}' Ready authority owner lease is unavailable.`);
                     }
                     const target = {

package/dist/runtime/locations/runtime.d.ts

@@ -83,7 +83,7 @@ export declare class ZLinkLocationRuntime implements ZLinkLocationRuntimeQuery {
     private readonly meshNames;
     private readonly leaseScopes;
     private readonly rewriteAuthorityPayloadForOwner?;
-    private nextLeaseRenewAtMs?;
+    private leaseOperationStartedAtMs;
     private ownerToken?;
     private lastOwnerToken?;
     private ownerLeaseDeadlineMs?;

package/dist/runtime/locations/runtime.js

@@ -52,7 +52,7 @@ class ZLinkLocationRuntime {
     meshNames;
     leaseScopes;
     rewriteAuthorityPayloadForOwner;
-    nextLeaseRenewAtMs;
+    leaseOperationStartedAtMs = 0;
     ownerToken;
     lastOwnerToken;
     ownerLeaseDeadlineMs;
@@ -191,12 +191,7 @@ class ZLinkLocationRuntime {
         const claim = this.renewOwnerLeaseOnce(signal, shutdownSignal);
         this.heartbeatRenewal = claim;
         try {
-            const claimed = await claim;
-            if (claimed) {
-                this.scheduleHeartbeat();
-                return;
-            }
-            this.nextLeaseRenewAtMs = this.monotonicNowMs() + this.options.ownerLeaseRenewIntervalMs;
+            await claim;
             this.scheduleHeartbeat();
         }
         catch (error) {
@@ -211,7 +206,7 @@ class ZLinkLocationRuntime {
             this.clearTimer(this.heartbeatTimer);
             this.heartbeatTimer = undefined;
         }
-        this.nextLeaseRenewAtMs = undefined;
+        this.leaseOperationStartedAtMs = 0;
         this.ownerLeaseDeadlineMs = undefined;
         await this.cleanupOwner(signal);
     }
@@ -263,6 +258,7 @@ class ZLinkLocationRuntime {
         const wasOwnerLeaseUsable = this.ownerLeaseUsable;
         try {
             const renewStartedAtMs = this.monotonicNowMs();
+            this.leaseOperationStartedAtMs = renewStartedAtMs;
             const result = await withTimeout((renewSignal) => this.stores.ownerLeaseStore.renewOwnerLease(this.ownerToken, this.options.ownerLeaseTtlMs, renewSignal), this.options.ownerLeaseRenewTimeoutMs, signal);
             const renewCompletedAtMs = this.monotonicNowMs();
             if (result.kind !== 'renewed') {
@@ -303,10 +299,11 @@ class ZLinkLocationRuntime {
     }
     async claimFreshOwnerLease(signal, shutdownSignal) {
         const claimStartedAtMs = this.monotonicNowMs();
-        const timeoutDeadline = performance.now() + this.options.ownerLeaseRenewTimeoutMs;
+        this.leaseOperationStartedAtMs = claimStartedAtMs;
+        const timeoutStartedAtMs = performance.now();
         let claim;
         try {
-            claim = await this.claimOwnerLeaseWithConfirmation(timeoutDeadline, signal, shutdownSignal);
+            claim = await this.claimOwnerLeaseWithConfirmation(timeoutStartedAtMs, signal, shutdownSignal);
         }
         catch (error) {
             if (signal?.aborted === true)
@@ -334,7 +331,6 @@ class ZLinkLocationRuntime {
             this.ownerLeaseRenewedAt = claim.storeNow;
             this.setOwnerLeaseDeadline(claimStartedAtMs, claimCompletedAtMs, claim.leaseExpiresAt, claim.storeNow);
             this.lastError = undefined;
-            this.nextLeaseRenewAtMs = this.monotonicNowMs() + this.options.ownerLeaseRenewIntervalMs;
             for (const handler of this.ownerLeaseRenewedHandlers) {
                 handler({
                     kind: 'renewed',
@@ -351,12 +347,12 @@ class ZLinkLocationRuntime {
             return false;
         }
     }
-    async claimOwnerLeaseWithConfirmation(timeoutDeadline, signal, shutdownSignal) {
+    async claimOwnerLeaseWithConfirmation(timeoutStartedAtMs, signal, shutdownSignal) {
         signal?.throwIfAborted();
         let claim;
         let request;
         try {
-            claim = await withTimeout((claimSignal) => (request = this.stores.ownerLeaseStore.claimOwnerLease(this.ownerId, this.options.ownerLeaseTtlMs, claimSignal)), remainingTimeoutMs(timeoutDeadline), signal);
+            claim = await withTimeout((claimSignal) => (request = this.stores.ownerLeaseStore.claimOwnerLease(this.ownerId, this.options.ownerLeaseTtlMs, claimSignal)), remainingTimeoutMs(timeoutStartedAtMs, this.options.ownerLeaseRenewTimeoutMs), signal);
         }
         catch (error) {
             if (error instanceof OwnerLeaseRenewTimeoutError)
@@ -364,7 +360,9 @@ class ZLinkLocationRuntime {
             if (signal?.aborted === true && request !== undefined) {
                 const cleanupSignal = shutdownSignal?.();
                 try {
-                    await withTimeout(() => request, cleanupSignal === undefined ? remainingTimeoutMs(timeoutDeadline) : undefined, cleanupSignal);
+                    await withTimeout(() => request, cleanupSignal === undefined
+                        ? remainingTimeoutMs(timeoutStartedAtMs, this.options.ownerLeaseRenewTimeoutMs)
+                        : undefined, cleanupSignal);
                 }
                 catch (completionError) {
                     if (cleanupSignal?.aborted === true ||
@@ -376,7 +374,7 @@ class ZLinkLocationRuntime {
                     }
                 }
             }
-            const confirmed = await this.confirmOwnerLease(error, timeoutDeadline, signal, shutdownSignal);
+            const confirmed = await this.confirmOwnerLease(error, timeoutStartedAtMs, signal, shutdownSignal);
             if (confirmed !== undefined)
                 return confirmed;
             throw error;
@@ -384,12 +382,14 @@ class ZLinkLocationRuntime {
         if (claim.kind !== 'conflict')
             return claim;
         const conflict = new ZLinkOwnerLeaseClaimError(claim.kind);
-        return ((await this.confirmOwnerLease(conflict, timeoutDeadline, signal, shutdownSignal)) ?? claim);
+        return ((await this.confirmOwnerLease(conflict, timeoutStartedAtMs, signal, shutdownSignal)) ?? claim);
     }
-    async confirmOwnerLease(originalError, timeoutDeadline, signal, shutdownSignal) {
+    async confirmOwnerLease(originalError, timeoutStartedAtMs, signal, shutdownSignal) {
         const cancelled = signal?.aborted === true;
         const cleanupSignal = cancelled ? shutdownSignal?.() : undefined;
-        const confirmationTimeoutMs = cleanupSignal === undefined ? remainingTimeoutMs(timeoutDeadline) : undefined;
+        const confirmationTimeoutMs = cleanupSignal === undefined
+            ? remainingTimeoutMs(timeoutStartedAtMs, this.options.ownerLeaseRenewTimeoutMs)
+            : undefined;
         if (confirmationTimeoutMs !== undefined && confirmationTimeoutMs <= 0)
             throw originalError;
         let confirmed;
@@ -407,7 +407,9 @@ class ZLinkLocationRuntime {
         }
         if (signal?.aborted === true) {
             try {
-                await withTimeout((releaseSignal) => this.stores.ownerLeaseStore.releaseOwnerLease(confirmed.token, releaseSignal), cleanupSignal === undefined ? remainingTimeoutMs(timeoutDeadline) : undefined, cleanupSignal);
+                await withTimeout((releaseSignal) => this.stores.ownerLeaseStore.releaseOwnerLease(confirmed.token, releaseSignal), cleanupSignal === undefined
+                    ? remainingTimeoutMs(timeoutStartedAtMs, this.options.ownerLeaseRenewTimeoutMs)
+                    : undefined, cleanupSignal);
             }
             catch (releaseError) {
                 this.recordFailure(errorMessage(releaseError), 'owner_lease_release');
@@ -778,7 +780,7 @@ class ZLinkLocationRuntime {
         if (!this.started) {
             return;
         }
-        const scheduledAt = this.nextLeaseRenewAtMs ?? this.monotonicNowMs() + this.options.ownerLeaseRenewIntervalMs;
+        const scheduledAt = this.leaseOperationStartedAtMs + this.options.ownerLeaseRenewIntervalMs;
         const delayMs = Math.max(0, scheduledAt - this.monotonicNowMs());
         this.heartbeatTimer = this.setTimer(() => {
             this.heartbeatTimer = undefined;
@@ -786,7 +788,6 @@ class ZLinkLocationRuntime {
             for (const scope of this.leaseScopes) {
                 this.metrics?.recordOwnerLeaseRenewLateness(lateness, scope.kind, scope.name);
             }
-            this.nextLeaseRenewAtMs = this.monotonicNowMs() + this.options.ownerLeaseRenewIntervalMs;
             if (this.ownerLeaseDeadlineMs !== undefined &&
                 this.monotonicNowMs() >= this.ownerLeaseDeadlineMs) {
                 this.ownerLeaseHealthy = false;
@@ -908,8 +909,8 @@ class OwnerLeaseRenewTimeoutError extends Error {
         this.name = 'OwnerLeaseRenewTimeoutError';
     }
 }
-function remainingTimeoutMs(timeoutDeadline) {
-    return Math.max(0, timeoutDeadline - performance.now());
+function remainingTimeoutMs(timeoutStartedAtMs, timeoutMs) {
+    return Math.max(0, timeoutMs - (performance.now() - timeoutStartedAtMs));
 }
 function errorMessage(error) {
     return error instanceof Error ? error.message : String(error);

package/dist/runtime/messaging/framework-json-v1.d.ts

@@ -1,7 +1,5 @@
-import type { ZLinkJsonSchema } from '../../contracts/Handlers/JsonContract';
+import * as profile from '@zlink-systems/stream-wire/internal/json';
 export declare const FRAMEWORK_JSON_V1_PROFILE = "framework-json-v1";
-export interface FrameworkJsonParseOptions {
-    readonly rejectPropertyName?: (name: string) => boolean;
-}
-export declare function stringifyFrameworkJsonV1(value: unknown, schema?: ZLinkJsonSchema): string;
-export declare function parseFrameworkJsonV1(text: string, options?: FrameworkJsonParseOptions, schema?: ZLinkJsonSchema): unknown;
+export declare const stringifyFrameworkJsonV1: typeof profile.stringifyFrameworkJsonV1;
+export declare const parseFrameworkJsonV1: typeof profile.parseFrameworkJsonV1;
+export type { FrameworkJsonParseOptions } from '@zlink-systems/stream-wire/internal/json';