@agentunion/fastaun 0.5.18 → 0.5.20

package/dist/client/rpc-pipeline.d.ts

@@ -61,6 +61,7 @@ export declare class RpcPipeline {
         background?: boolean;
         pullGateKey?: string;
     }): Promise<unknown>;
+    private observeBackgroundPullResponse;
     private transportCallWithIdentityRecovery;
     postprocessResult(method: string, params: RpcParams, result: unknown, options?: {
         skipGroupState?: boolean;

package/dist/client/rpc-pipeline.js

@@ -1,6 +1,8 @@
 import * as crypto from 'node:crypto';
 import { normalizeSlotId, slotIsolationKey } from '../config.js';
 import { certTimeError } from '../cert-utils.js';
+import { orgRequestParams, validateOrgRequestJSON } from '../org-protocol.js';
+import { canonicalJson as canonicalClientRequest } from '../v2/crypto/canonical.js';
 import { ClientSignatureError, ConnectionError, PermissionError, TimeoutError, ValidationError } from '../errors.js';
 import { ConnectionState, isJsonObject, } from '../types.js';
 import { validateAIDFormat, validateGroupIDFormat } from '../validators.js';
@@ -113,6 +115,7 @@ function getCertFingerprint(certPem) {
 /** 旧式 tryAcquirePullGate 的防并发窗口。 */
 const PULL_GATE_STALE_MS = 35_000;
 const PULL_GATE_OPERATION_TIMEOUT_MS = 35_000;
+const PULL_GATE_MAX_ACTIVE = 4;
 function sameIdentityAdmissionRejection(error, original) {
     const errorCode = Number(error?.code);
     const originalCode = Number(original?.code);
@@ -165,6 +168,7 @@ export class RpcPipeline {
     }
     async call(method, params) {
         const client = this.runtime.client;
+        const generation = client._delivery?.captureInlineAckGeneration?.();
         const tStart = Date.now();
         const requestedAckSeq = method === 'message.ack' || method === 'message.v2.ack'
             ? Number(params?.seq
@@ -355,6 +359,9 @@ export class RpcPipeline {
                 return this.bindActivePullCancellation(method, p, request);
             };
             let result = await this.transportCallWithIdentityRecovery(invokeTransport, method, p);
+            if (generation === client._delivery?.captureInlineAckGeneration?.()) {
+                this.observeBackgroundPullResponse(method, p, result, pullGateNamespace);
+            }
             const sendResultModeSource = result;
             result = await this.postprocessResult(method, p, result, {
                 skipGroupState: deferGroupReadyPostprocess,
@@ -370,6 +377,10 @@ export class RpcPipeline {
             client._clientLog.debug(`call exit (error): method=${method} elapsed=${Date.now() - tStart}ms err=${err instanceof Error ? err.message : String(err)}`);
             throw err;
         }
+        finally {
+            if (generation === client._delivery?.captureInlineAckGeneration?.())
+                client._delivery?.requestBackgroundPullRecovery?.();
+        }
     }
     preflight(method, params) {
         const client = this.runtime.client;
@@ -502,7 +513,10 @@ export class RpcPipeline {
     }
     applyClientSignature(method, params) {
         try {
-            if (!SIGNED_METHODS.has(method)) {
+            if (method.startsWith('org.')) {
+                params.aad = orgRequestParams(method, params).aad;
+            }
+            else if (!SIGNED_METHODS.has(method)) {
                 return;
             }
             if (this.shouldSkipClientSignature(method, params)) {
@@ -527,8 +541,11 @@ export class RpcPipeline {
         const currentAid = (internal && typeof internal === 'object')
             ? internal
             : this.runtime.client._currentAid;
-        if (!currentAid?.privateKeyPem)
+        if (!currentAid?.privateKeyPem) {
+            if (method.startsWith('org.'))
+                throw new ClientSignatureError('组织请求签名身份不可用');
             return;
+        }
         try {
             const aid = currentAid.aid;
             const certPem = currentAid.certPem ?? '';
@@ -543,8 +560,16 @@ export class RpcPipeline {
                     paramsForHash[k] = v;
                 }
             }
-            const paramsJson = stableStringify(paramsForHash);
+            if (method.startsWith('org.'))
+                validateOrgRequestJSON(paramsForHash);
+            const paramsJson = method.startsWith('org.') ? new TextDecoder().decode(canonicalClientRequest(paramsForHash)) : stableStringify(paramsForHash);
             const paramsHash = crypto.createHash('sha256').update(paramsJson, 'utf-8').digest('hex');
+            if (params.client_signature !== undefined) {
+                const existing = params.client_signature;
+                if (!isJsonObject(existing) || existing.aid !== aid || existing.cert_fingerprint !== getCertFingerprint(certPem) || existing.params_hash !== paramsHash || typeof existing.timestamp !== 'string' || !/^\d+$/.test(existing.timestamp) || typeof existing.signature !== 'string' || !crypto.verify('SHA256', Buffer.from(`${method}|${aid}|${existing.timestamp}|${paramsHash}`, 'utf-8'), crypto.createPublicKey(certPem), Buffer.from(existing.signature, 'base64')))
+                    throw new Error('已有客户端签名与请求内容不一致');
+                return;
+            }
             const signData = Buffer.from(`${method}|${aid}|${ts}|${paramsHash}`, 'utf-8');
             const privateKey = getSigningPrivateKey(currentAid.privateKeyPem);
             const signature = crypto.sign('SHA256', signData, privateKey);
@@ -634,7 +659,7 @@ export class RpcPipeline {
         const name = this.pullGateName(key);
         let state = this.pullGateStates.get(name);
         if (!state) {
-            state = { active: null, foreground: [], background: [], byKey: new Map(), lifecycle: new Map(), watchdog: null };
+            state = { activeByNamespace: new Map(), foreground: [], background: [], byKey: new Map(), lifecycle: new Map(), watchdog: null };
             this.pullGateStates.set(name, state);
         }
         this.startPullGateWatchdog(state, name);
@@ -665,23 +690,25 @@ export class RpcPipeline {
         }
     }
     checkPullGate(state, name) {
-        const active = state.active;
-        if (!active) {
+        const activeJobs = [...state.activeByNamespace.values()];
+        if (activeJobs.length === 0) {
             this.drainPullGate(state);
             return;
         }
-        if (!active.pullingStartedAt || Date.now() - active.pullingStartedAt < this.pullGateOperationTimeoutMs())
-            return;
-        if (active.timedOut)
-            return;
-        active.timedOut = true;
-        active.invalidated = true;
-        active.cancel?.();
-        const timeout = new TimeoutError(`pull gate timeout: ${active.namespace}`, { retryable: true });
-        this.runtime.client._clientLog.warn(`pull gate watchdog timeout: gate=${name} key=${active.key} elapsed=${Date.now() - active.pullingStartedAt}ms`);
-        // 仅拒绝当前调用方；取消不敏感的 operation 仍可能运行，必须等其
-        // 真正 settle 后才释放 active，避免与后续 Pull 并发修改游标。
-        active.reject(timeout);
+        for (const active of activeJobs) {
+            if (!active.pullingStartedAt || Date.now() - active.pullingStartedAt < this.pullGateOperationTimeoutMs())
+                continue;
+            if (active.timedOut)
+                continue;
+            active.timedOut = true;
+            active.invalidated = true;
+            active.cancel?.();
+            const timeout = new TimeoutError(`pull gate timeout: ${active.namespace}`, { retryable: true });
+            this.runtime.client._clientLog.warn(`pull gate watchdog timeout: gate=${name} key=${active.key} elapsed=${Date.now() - active.pullingStartedAt}ms`);
+            // 仅拒绝当前调用方；取消不敏感的 operation 仍可能运行，必须等其
+            // 真正 settle 后才释放 active，避免与后续 Pull 并发修改游标。
+            active.reject(timeout);
+        }
     }
     pullScopeKey(key) {
         return key.split('|', 1)[0] ?? key;
@@ -696,7 +723,7 @@ export class RpcPipeline {
         if (typeof cancel !== 'function' || !key)
             return request;
         const state = this.pullGateStates.get(this.pullGateName(key));
-        const active = state?.active;
+        const active = [...(state?.activeByNamespace.values() ?? [])].find((candidate) => candidate.key === key);
         if (!active || active.key !== key || active.timedOut || active.invalidated)
             return request;
         const boundCancel = () => cancel.call(request);
@@ -734,8 +761,8 @@ export class RpcPipeline {
                 return true;
         }
         for (const state of this.pullGateStates.values()) {
-            const jobs = [state.active, ...state.foreground, ...state.background];
-            if (jobs.some((job) => job !== null && this.pullScopeKey(job.key) === ns))
+            const jobs = [...state.activeByNamespace.values(), ...state.foreground, ...state.background];
+            if (jobs.some((job) => this.pullScopeKey(job.key) === ns))
                 return true;
         }
         return false;
@@ -798,7 +825,7 @@ export class RpcPipeline {
         const ns = this.pullScopeKey(namespace);
         if (!ns)
             return true;
-        const active = this.pullGateStates.get(this.pullGateName(ns))?.active;
+        const active = this.pullGateStates.get(this.pullGateName(ns))?.activeByNamespace.get(ns);
         return !active || active.namespace !== ns || (!active.timedOut && !active.invalidated);
     }
     invalidatePulls() {
@@ -809,8 +836,8 @@ export class RpcPipeline {
         const waits = [];
         for (const state of this.pullGateStates.values()) {
             const jobs = new Set();
-            if (state.active)
-                jobs.add(state.active);
+            for (const active of state.activeByNamespace.values())
+                jobs.add(active);
             for (const job of state.foreground)
                 jobs.add(job);
             for (const job of state.background)
@@ -851,6 +878,9 @@ export class RpcPipeline {
         return this.pullInvalidationWait !== null;
     }
     async runPullSerialized(key, operation, background = false) {
+        if (this.runtime.client._dispatcher?._isApplicationHandler?.()) {
+            throw new Error('pull cannot wait inside an application handler');
+        }
         if (this.pullInvalidationInProgress()) {
             throw new Error('pull invalidated');
         }
@@ -865,7 +895,7 @@ export class RpcPipeline {
         }
         const state = this.pullGateState(key);
         const namespace = this.pullScopeKey(key);
-        const active = state.active?.key === key && !state.active.timedOut && !state.active.invalidated ? state.active : null;
+        const active = [...state.activeByNamespace.values()].find((job) => job.key === key && !job.timedOut && !job.invalidated) ?? null;
         const queuedForeground = state.foreground.find((job) => job.key === key && !job.timedOut && !job.invalidated);
         const queuedBackground = state.background.find((job) => job.key === key && !job.timedOut && !job.invalidated);
         const existing = background
@@ -925,8 +955,8 @@ export class RpcPipeline {
             return;
         const state = this.pullGateState(key);
         const namespace = this.pullScopeKey(key);
-        const job = state.active?.key === key ? state.active : null;
-        if (!job || state.active !== job || job.timedOut || job.invalidated)
+        const job = [...state.activeByNamespace.values()].find((candidate) => candidate.key === key) ?? null;
+        if (!job || job.timedOut || job.invalidated)
             return;
         const replacementKey = String(nextKey || key);
         if (state.byKey.get(job.key) === job)
@@ -945,7 +975,7 @@ export class RpcPipeline {
         state.lifecycle.set(namespace, 'pulled');
         job.suspended = true;
         job.resume = new Promise((resolve) => { job.resumeResolve = resolve; });
-        state.active = null;
+        state.activeByNamespace.delete(namespace);
         (job.background ? state.background : state.foreground).push(job);
         this.drainPullGate(state);
         if (job.resume) {
@@ -965,63 +995,68 @@ export class RpcPipeline {
         if (!ns)
             return;
         const state = this.pullGateStates.get(this.pullGateName(ns));
-        if (!state || state.active?.namespace !== ns)
+        if (!state || !state.activeByNamespace.has(ns))
             return;
         state.lifecycle.set(ns, lifecycle);
     }
     drainPullGate(state) {
-        if (state.active)
-            return;
         const takeRunnable = (queue) => {
-            const index = queue.findIndex((candidate) => !this.hasInlineRealtimeGuard(this.pullScopeKey(candidate.key)));
+            const index = queue.findIndex((candidate) => (!this.hasInlineRealtimeGuard(this.pullScopeKey(candidate.key))
+                && !state.activeByNamespace.has(candidate.namespace)));
             return index >= 0 ? queue.splice(index, 1)[0] : undefined;
         };
-        const job = takeRunnable(state.foreground) ?? takeRunnable(state.background);
-        if (!job)
-            return;
-        state.active = job;
-        this.runtime.client._delivery?.syncStarted?.(job.namespace);
-        if (job.timer) {
-            clearTimeout(job.timer);
-            job.timer = null;
-        }
-        job.pullingStartedAt = Date.now();
-        job.timedOut = false;
-        state.lifecycle.set(job.namespace, 'pulling');
-        const resumeResolve = job.resumeResolve;
-        job.resume = null;
-        job.resumeResolve = null;
-        if (job.suspended) {
-            job.suspended = false;
-            resumeResolve?.();
-            return;
-        }
-        job.running = true;
-        const operationPromise = this.executePullOperation(job.operation, job.background);
-        let failed = false;
-        void operationPromise
-            .then((value) => { if (!job.timedOut && !job.invalidated)
-            job.resolve(value); }, (error) => {
-            failed = true;
-            if (!job.timedOut && !job.invalidated)
-                job.reject(error);
-        })
-            .finally(() => {
-            state.lifecycle.set(job.namespace, 'idle');
-            if (state.active === job)
-                state.active = null;
-            if (state.byKey.get(job.key) === job)
-                state.byKey.delete(job.key);
-            this.drainPullGate(state);
-            job.settledResolve?.();
-            job.settledResolve = null;
-            if (!job.invalidated) {
-                this.runtime.client._delivery?.onPullGateIdle?.(job.namespace);
+        while (state.activeByNamespace.size < PULL_GATE_MAX_ACTIVE) {
+            const foregroundJob = takeRunnable(state.foreground);
+            const foregroundDrained = foregroundJob !== undefined && state.foreground.length === 0;
+            const job = foregroundJob ?? takeRunnable(state.background);
+            if (!job)
+                break;
+            state.activeByNamespace.set(job.namespace, job);
+            this.runtime.client._delivery?.syncStarted?.(job.namespace);
+            if (foregroundDrained)
+                this.runtime.client._delivery?.onForegroundPullsDrained?.();
+            if (job.timer) {
+                clearTimeout(job.timer);
+                job.timer = null;
             }
-            if (failed || job.invalidated)
-                this.runtime.client._delivery?.onPullAborted?.();
-            this.notifyPullDrainedIfIdle();
-        });
+            job.pullingStartedAt = Date.now();
+            job.timedOut = false;
+            state.lifecycle.set(job.namespace, 'pulling');
+            const resumeResolve = job.resumeResolve;
+            job.resume = null;
+            job.resumeResolve = null;
+            if (job.suspended) {
+                job.suspended = false;
+                resumeResolve?.();
+                continue;
+            }
+            job.running = true;
+            const operationPromise = this.executePullOperation(job.operation, job.background);
+            let failed = false;
+            void operationPromise
+                .then((value) => { if (!job.timedOut && !job.invalidated)
+                job.resolve(value); }, (error) => {
+                failed = true;
+                if (!job.timedOut && !job.invalidated)
+                    job.reject(error);
+            })
+                .finally(() => {
+                state.lifecycle.set(job.namespace, 'idle');
+                if (state.activeByNamespace.get(job.namespace) === job)
+                    state.activeByNamespace.delete(job.namespace);
+                if (state.byKey.get(job.key) === job)
+                    state.byKey.delete(job.key);
+                this.drainPullGate(state);
+                job.settledResolve?.();
+                job.settledResolve = null;
+                if (!job.invalidated) {
+                    this.runtime.client._delivery?.onPullGateIdle?.(job.namespace);
+                }
+                if (failed || job.invalidated)
+                    this.runtime.client._delivery?.onPullAborted?.();
+                this.notifyPullDrainedIfIdle();
+            });
+        }
     }
     notifyPullDrainedIfIdle() {
         if (this.pullDrainedCheckQueued)
@@ -1037,7 +1072,7 @@ export class RpcPipeline {
     }
     notifyPullDrainedIfIdleStable() {
         for (const state of this.pullGateStates.values()) {
-            if (state.active || state.foreground.length > 0 || state.background.length > 0)
+            if (state.activeByNamespace.size > 0 || state.foreground.length > 0 || state.background.length > 0)
                 return;
         }
         const client = this.runtime.client;
@@ -1055,7 +1090,7 @@ export class RpcPipeline {
         const { timeout, trace, signed = true, background = false, pullGateKey = '' } = opts;
         const client = this.runtime.client;
         const payload = params ? { ...params } : {};
-        if (signed) {
+        if (signed || method.startsWith('org.')) {
             this.applyClientSignature(method, payload);
         }
         const invokeTransport = () => {
@@ -1070,9 +1105,34 @@ export class RpcPipeline {
                 request = client._transport.call(method, payload);
             return this.bindActivePullCancellation(method, payload, request, pullGateKey);
         };
-        const result = await this.transportCallWithIdentityRecovery(invokeTransport, method, payload);
-        this.throwIfPullInvalidated(this.pullScopeKey(pullGateKey || this.pullGateKeyForCall(method, payload)));
-        return result;
+        const generation = client._delivery?.captureInlineAckGeneration?.();
+        try {
+            const result = await this.transportCallWithIdentityRecovery(invokeTransport, method, payload);
+            this.throwIfPullInvalidated(this.pullScopeKey(pullGateKey || this.pullGateKeyForCall(method, payload)));
+            if (generation === client._delivery?.captureInlineAckGeneration?.()) {
+                this.observeBackgroundPullResponse(method, payload, result, pullGateKey);
+            }
+            return result;
+        }
+        finally {
+            if (generation === client._delivery?.captureInlineAckGeneration?.())
+                client._delivery?.requestBackgroundPullRecovery?.();
+        }
+    }
+    observeBackgroundPullResponse(method, params, result, key = '') {
+        if (!['message.pull', 'message.v2.pull', 'group.pull', 'group.v2.pull', 'group.pull_events'].includes(method)
+            || params.force === true || params.window_mode === 'tail')
+            return;
+        const client = this.runtime.client;
+        if (method.startsWith('group.') && !this.groupCursorTargetsCurrentInstance(params))
+            return;
+        const explicitCursor = this.explicitGroupCursorParams(params);
+        if (method.startsWith('group.') && !this.groupCursorTargetsCurrentInstance(explicitCursor))
+            return;
+        const ns = this.pullScopeKey(key) || (method === 'group.pull_events'
+            ? `group_event:${String(params.group_id ?? params.group_aid ?? '')}`
+            : method.startsWith('group.') ? `group:${String(params.group_id ?? params.group_aid ?? '')}` : `p2p:${client._aid}`);
+        client._delivery?.observeBackgroundPullResponse?.(ns, Number(params.after_seq ?? params.after_event_seq ?? 0), result, Number(params.limit ?? 50));
     }
     async transportCallWithIdentityRecovery(operation, method, params) {
         try {