@agentunion/fastaun 0.5.21 → 0.5.22

package/dist/client.js

@@ -495,10 +495,10 @@ export class AUNClient {
             currentType: () => this.getType(),
             now: () => Math.trunc(Date.now() / 1000),
             readAgentMdFresh: (subAid) => this._agentMdManager.readOwnershipFresh(subAid),
-            submitAgentMdRaw: (subAid, raw, condition, assertActive) => this._agentMdManager.submitOwnershipRaw(subAid, raw, condition, assertActive),
+            submitAgentMdRaw: (subAid, raw, condition, assertActive, stage) => this._agentMdManager.submitOwnershipRaw(subAid, raw, condition, assertActive, stage),
             readOwnerMd: (ownerAid, subAid) => this._getOwnershipStorage().readOwnerMd(ownerAid, subAid),
             writeOwnerMd: (ownerAid, subAid, raw, original, assertActive) => this._getOwnershipStorage().writeOwnerMd(ownerAid, subAid, raw, original, assertActive),
-            deleteOwnerMd: (ownerAid, subAid) => this._getOwnershipStorage().deleteOwnerMd(ownerAid, subAid),
+            deleteOwnerMd: (ownerAid, subAid, expectedVersion) => this._getOwnershipStorage().deleteOwnerMd(ownerAid, subAid, expectedVersion),
             resolveCertificate: async (aid, fingerprint, purpose) => this._auth.resolveOwnershipCertificate(await this._resolveOwnershipCertificateGateway(aid), aid, fingerprint, purpose),
         });
     }
@@ -506,7 +506,7 @@ export class AUNClient {
         return this._ownershipWorkflow ??= new OwnershipWorkflow({
             currentAid: () => this._aid, store: this._tokenStore, files: this._getOwnershipFiles(),
             currentType: () => this.getType(),
-            send: (to, payload) => this.call('message.send', { to, encrypt: true, payload: payload }),
+            send: (to, payload, messageId) => this.call('message.send', { to, encrypt: true, message_id: messageId, payload: payload }),
             emit: (event, payload) => this._dispatcher.enqueue(event, payload),
         });
     }
@@ -647,11 +647,11 @@ export class AUNClient {
     _credentialCurrent(input) {
         return this._getCredentialRenewal().current(input);
     }
-    async _resumeCredentialRenewalAfterConnect(guard) {
+    async _resumeCredentialRenewalAfterConnect(guard, syncRevocations = false) {
         if (!this._aid || (guard && !guard.current()))
             return;
         await this._safeAsync(guard ? this._credentialRenewalSigner(this._aid, guard) : this._credentialRenewalSigner(this._aid));
-        if (!guard || guard.current())
+        if (syncRevocations && (!guard || guard.current()))
             await this._safeAsync(this._getCredentialRenewal()._syncRevocations?.(guard) ?? Promise.resolve());
         if (!guard || guard.current())
             await this._getCredentialRenewal().resume(guard);
@@ -665,11 +665,15 @@ export class AUNClient {
         this._credentialRenewalAbort = abort;
         const current = () => this._credentialRenewalAbort === abort && !abort.signal.aborted && aid === this._aid && version === this._serviceEventIdentityVersion && ['ready', 'connected'].includes(this._state) && !this._closing && !this._disconnecting;
         const guard = { current, signal: abort.signal };
+        let nextRevocationSync = Date.now() + 3_600_000;
         const scan = async () => {
             const task = this._credentialRenewalScan.then(async () => {
                 if (!current())
                     return;
-                await this._resumeCredentialRenewalAfterConnect(guard);
+                const syncRevocations = Date.now() >= nextRevocationSync;
+                if (syncRevocations)
+                    nextRevocationSync = Date.now() + 3_600_000;
+                await this._resumeCredentialRenewalAfterConnect(guard, syncRevocations);
             });
             this._credentialRenewalScan = task.catch(() => { });
             await this._safeAsync(task);
@@ -701,10 +705,14 @@ export class AUNClient {
         const version = this._serviceEventIdentityVersion;
         const signal = this._serviceEventIdentityAbort.signal;
         const expiresAt = Number(payload?.expires_at);
-        const current = () => version === this._serviceEventIdentityVersion && targetAid === (this._identity?.aid ?? '') && Date.now() / 1000 < expiresAt;
+        const transport = this._transport, connectionGeneration = transport?._connectionGeneration, workerGeneration = transport?._workerGeneration;
+        const current = () => version === this._serviceEventIdentityVersion && targetAid === (this._identity?.aid ?? '') && transport === this._transport && connectionGeneration === this._transport?._connectionGeneration && workerGeneration === this._transport?._workerGeneration && Date.now() / 1000 < expiresAt;
         const verified = await verifyServiceEvent(event, payload, { targetAid, resolveEventCertificate: (aid, fingerprint) => this._fetchServiceEventCertificate(aid, fingerprint), resolveCredentialService: this.resolveCredentialService });
         if (!current())
             throw new ValidationError('service event receiver identity changed');
+        if (['credential.revoked', 'credential.revocationList'].includes(event.replace(/^event\//, ''))) {
+            await this._getCredentialRenewal()._receiveRevocations(payload, { current, signal });
+        }
         if (event.replace(/^event\//, '') === 'org.member.changed' && isJsonObject(payload) && Object.hasOwn(payload, 'membership_package')) {
             await this._getCredentialRenewal().importMembershipPackage(payload, { current, signal });
             if (!current())
@@ -1614,6 +1622,9 @@ export class AUNClient {
             if (!isJsonObject(raw))
                 continue;
             const group = raw;
+            const status = String(group.status ?? '').trim().toLowerCase();
+            if (status && status !== 'active')
+                continue;
             const role = String(group.role ?? group.my_role ?? '').trim().toLowerCase();
             const groupId = String(group.group_id ?? group.groupId ?? group.group_aid ?? group.groupAid ?? '').trim();
             const groupAid = String(group.group_aid ?? group.groupAid ?? groupId).trim();
@@ -1753,7 +1764,7 @@ export class AUNClient {
                     await this.createOrg(creation.source_params, { aidStore: store });
                     continue;
                 }
-                if (transfer?.owner_aid === this._aid) {
+                if (transfer?.owner_aid === this._aid && transfer.phase !== 'completed') {
                     await this.completeOrgTransfer(transfer.source_params, { aidStore: store });
                     continue;
                 }
@@ -1817,8 +1828,14 @@ export class AUNClient {
         let pending = (typeof tokenStore._loadMetadataStrict === 'function' ? tokenStore._loadMetadataStrict(orgAid) : tokenStore.loadMetadata(orgAid))?.org_identity_transfer;
         if (pending != null && !isJsonObject(pending))
             throw ownershipFailure('persistence_unavailable', 'Org transfer checkpoint is invalid');
+        if (pending?.phase === 'completed' && pending.transfer_id !== transferId)
+            pending = undefined;
         if (pending && (pending.transfer_id !== transferId || pending.owner_aid !== owner.aid || pending.input_hash !== inputHash))
             throw ownershipFailure('conflict', 'pending Org transfer context changed');
+        if (pending?.phase === 'completed') {
+            localStore.clearPendingGroupBind(pendingKey);
+            return pending.result;
+        }
         if (!pending)
             await this._verifyOrgTransferMaterials(params, owner.aid);
         let keyPair = localStore.loadPendingGroupBind(pendingKey);
@@ -1879,7 +1896,7 @@ export class AUNClient {
         }
         const result = await this.call('org.lifecycle.transferAccept', await this._resumeOrgRequest('org.lifecycle.transferAccept', pending.finalize_params, target));
         await this._uploadOrgAgentMd(store, orgAid, pending.source_params);
-        tokenStore.saveMetadata(orgAid, { org_identity_transfer: null });
+        tokenStore.saveMetadata(orgAid, { org_identity_transfer: { transfer_id: transferId, owner_aid: owner.aid, input_hash: inputHash, phase: 'completed', result } });
         localStore.clearPendingGroupBind(pendingKey);
         return result;
     }
@@ -2132,7 +2149,13 @@ export class AUNClient {
             entityIdentityGetter: (aid, type) => this._freshEntityCertificate(aid, type),
             entitySignerResolver: (aid, fingerprint) => this._freshEntitySigner(aid, fingerprint),
             gatewayResolver: (aid) => identityStore._resolveGateway(aid),
-            accessTokenResolver: (_aid, gatewayUrl) => identityStore._uploadAgentMdToken(identity, gatewayUrl),
+            accessTokenResolver: async () => {
+                const state = identityStore._tokenStore?.loadInstanceState?.(identity.aid, store.deviceId, store.slotId) ?? {};
+                const token = AuthFlow._getCachedAccessToken(state);
+                if (token && String(state.refresh_token ?? '') && !this._auth._validateCachedCredentials(identityStore._authIdentityFromAid(identity)))
+                    return token;
+                return identityStore._uploadAgentMdToken(identity, await identityStore._resolveGateway(identity.aid));
+            },
             aidValidator: (aid) => identityStore._registerFlow.validateAidName(aid),
         });
         return await manager.resumePendingUpload(groupAid);
@@ -2607,6 +2630,11 @@ export class AUNClient {
         const tStart = Date.now();
         this._clientLog.debug(`on enter: event=${event}`);
         const result = this._dispatcher.subscribe(event, handler);
+        if (event === 'message.received' || event === 'message.recalled' || event === 'message.batch') {
+            if (this._p2pPeerPullEnabled)
+                this._delivery.refreshPendingPeers();
+            this._delivery.requestBackgroundPullRecovery();
+        }
         this._clientLog.debug(`on exit: elapsed=${Date.now() - tStart}ms event=${event}`);
         return result;
     }