@naylence/runtime 0.3.5-test.908 → 0.3.5-test.909

package/dist/esm/naylence/fame/connector/inpage-listener.js

@@ -0,0 +1,418 @@
+import { DeliveryOriginType, FameChannelMessage, FameResponseType, deserializeEnvelope, } from '@naylence/core';
+import { TransportListener } from './transport-listener.js';
+import { getLogger } from '../util/logging.js';
+import { GRANT_PURPOSE_NODE_ATTACH } from '../grants/grant.js';
+import { INPAGE_CONNECTOR_TYPE } from './inpage-connector.js';
+import { GrantSelectionContext, defaultGrantSelectionPolicy, } from './grant-selection-policy.js';
+import { INPAGE_CONNECTION_GRANT_TYPE, inPageGrantToConnectorConfig, } from '../grants/inpage-connection-grant.js';
+import { QueueFullError } from '../util/bounded-async-queue.js';
+const logger = getLogger('naylence.fame.connector.inpage_listener');
+const DEFAULT_CHANNEL = 'naylence-fabric';
+const DEFAULT_INBOX_CAPACITY = 2048;
+const isBrowserEnvironment = () => typeof window !== 'undefined' &&
+    typeof document !== 'undefined' &&
+    typeof EventTarget !== 'undefined' &&
+    typeof MessageEvent !== 'undefined';
+const ensureBrowserEnvironment = () => {
+    if (!isBrowserEnvironment()) {
+        throw new Error('InPageListener is browser-only and requires DOM EventTarget support');
+    }
+};
+let _lastInPageListenerInstance = null;
+const getSharedBus = () => {
+    ensureBrowserEnvironment();
+    const globalWithBus = globalThis;
+    if (!globalWithBus.__naylence_inpage_bus__) {
+        globalWithBus.__naylence_inpage_bus__ = new EventTarget();
+    }
+    return globalWithBus.__naylence_inpage_bus__;
+};
+const coercePayload = (raw) => {
+    if (raw instanceof Uint8Array) {
+        return raw;
+    }
+    if (raw instanceof ArrayBuffer) {
+        return new Uint8Array(raw);
+    }
+    if (typeof ArrayBuffer !== 'undefined' && ArrayBuffer.isView(raw)) {
+        const view = raw;
+        return new Uint8Array(view.buffer, view.byteOffset, view.byteLength);
+    }
+    if (raw && typeof raw === 'object') {
+        const candidate = raw;
+        if (candidate.constructor?.name === 'Uint8Array') {
+            const view = raw;
+            return new Uint8Array(view.buffer.slice(view.byteOffset, view.byteOffset + view.byteLength));
+        }
+    }
+    if (Array.isArray(raw) && raw.every((item) => typeof item === 'number')) {
+        return Uint8Array.from(raw);
+    }
+    return null;
+};
+const isRoutingNodeLike = (node) => typeof node.createOriginConnector === 'function';
+export class InPageListener extends TransportListener {
+    constructor(options) {
+        super();
+        this._isRunning = false;
+        this._initialized = false;
+        this._routingNode = null;
+        this._bus = null;
+        this._busHandler = null;
+        this._senderRegistry = new Map();
+        this._systemToSender = new Map();
+        this._pendingAttachments = new Map();
+        ensureBrowserEnvironment();
+        const channelCandidate = options?.channelName;
+        const inboxCandidate = options?.inboxCapacity;
+        this._channelName =
+            typeof channelCandidate === 'string' && channelCandidate.trim().length > 0
+                ? channelCandidate.trim()
+                : DEFAULT_CHANNEL;
+        const normalizedCapacity = typeof inboxCandidate === 'number' && Number.isFinite(inboxCandidate) && inboxCandidate > 0
+            ? Math.floor(inboxCandidate)
+            : DEFAULT_INBOX_CAPACITY;
+        this._inboxCapacity = normalizedCapacity;
+        _lastInPageListenerInstance = this;
+    }
+    get channelName() {
+        return this._channelName;
+    }
+    get inboxCapacity() {
+        return this._inboxCapacity;
+    }
+    get isRunning() {
+        return this._isRunning;
+    }
+    get initialized() {
+        return this._initialized;
+    }
+    async onNodeInitialized(node) {
+        ensureBrowserEnvironment();
+        if (this._initialized) {
+            return;
+        }
+        this._routingNode = isRoutingNodeLike(node) ? node : null;
+        this._initialized = true;
+        logger.debug('inpage_listener_initialized', {
+            channel: this._channelName,
+            inbox_capacity: this._inboxCapacity,
+            routing_capable: Boolean(this._routingNode),
+        });
+    }
+    async onNodeStarted(node) {
+        ensureBrowserEnvironment();
+        if (this._isRunning) {
+            return;
+        }
+        if (!this._routingNode && isRoutingNodeLike(node)) {
+            this._routingNode = node;
+        }
+        if (this._routingNode) {
+            this._registerBusListener();
+        }
+        else {
+            logger.warning('inpage_listener_missing_routing_capability');
+        }
+        this._isRunning = true;
+        logger.debug('inpage_listener_started', {
+            channel: this._channelName,
+        });
+    }
+    async onNodeStopped(_node) {
+        if (!this._isRunning) {
+            return;
+        }
+        this._isRunning = false;
+        this._unregisterBusListener();
+        this._senderRegistry.clear();
+        this._systemToSender.clear();
+        this._pendingAttachments.clear();
+        logger.debug('inpage_listener_stopped', {
+            channel: this._channelName,
+        });
+    }
+    getCallbackGrant() {
+        return this.withLegacySnakeCaseKeys({
+            type: INPAGE_CONNECTION_GRANT_TYPE,
+            purpose: GRANT_PURPOSE_NODE_ATTACH,
+            channelName: this._channelName,
+            inboxCapacity: this._inboxCapacity,
+        });
+    }
+    asCallbackGrant() {
+        return this.withLegacySnakeCaseKeys({
+            type: INPAGE_CONNECTOR_TYPE,
+            channelName: this._channelName,
+            inboxCapacity: this._inboxCapacity,
+        });
+    }
+    _registerBusListener() {
+        if (this._busHandler) {
+            return;
+        }
+        const handler = (event) => {
+            void this._handleBusEvent(event);
+        };
+        const bus = getSharedBus();
+        bus.addEventListener(this._channelName, handler);
+        this._bus = bus;
+        this._busHandler = handler;
+    }
+    _unregisterBusListener() {
+        if (!this._bus || !this._busHandler) {
+            return;
+        }
+        this._bus.removeEventListener(this._channelName, this._busHandler);
+        this._bus = null;
+        this._busHandler = null;
+    }
+    async _handleBusEvent(event) {
+        if (!this._routingNode) {
+            return;
+        }
+        const normalized = this._parseBusEvent(event);
+        if (!normalized) {
+            return;
+        }
+        const { senderId, envelope } = normalized;
+        if (this._isNodeAttachFrame(envelope.frame)) {
+            await this._handleAttachFrame(senderId, envelope);
+            return;
+        }
+        const entry = this._senderRegistry.get(senderId);
+        if (!entry) {
+            logger.debug('inpage_listener_no_connector_for_sender', {
+                sender_id: senderId,
+                frame_type: envelope.frame?.type ?? 'unknown',
+            });
+            return;
+        }
+        await this._deliverEnvelope(entry, envelope);
+    }
+    _parseBusEvent(event) {
+        if (!event || typeof event !== 'object') {
+            return null;
+        }
+        const messageEvent = event;
+        const payloadContainer = messageEvent?.data;
+        if (!payloadContainer || typeof payloadContainer !== 'object') {
+            return null;
+        }
+        const record = payloadContainer;
+        const senderId = record.senderId;
+        if (typeof senderId !== 'string' || senderId.length === 0) {
+            return null;
+        }
+        const payload = coercePayload(record.payload);
+        if (!payload) {
+            logger.debug('inpage_listener_ignored_event_without_payload', {
+                sender_id: senderId,
+            });
+            return null;
+        }
+        let envelope;
+        try {
+            const decoded = new TextDecoder().decode(payload);
+            const parsed = JSON.parse(decoded);
+            envelope = deserializeEnvelope(parsed);
+        }
+        catch (error) {
+            logger.debug('inpage_listener_envelope_parse_failed', {
+                sender_id: senderId,
+                error: error instanceof Error ? error.message : String(error),
+            });
+            return null;
+        }
+        return { senderId, envelope };
+    }
+    async _handleAttachFrame(senderId, envelope) {
+        const frame = envelope.frame;
+        const systemId = frame.systemId;
+        if (typeof systemId !== 'string' || systemId.length === 0) {
+            logger.warning('inpage_listener_attach_missing_system_id', {
+                sender_id: senderId,
+            });
+            return;
+        }
+        const normalizedOrigin = frame.originType ?? DeliveryOriginType.DOWNSTREAM;
+        const existingEntry = this._senderRegistry.get(senderId);
+        if (existingEntry) {
+            await this._deliverEnvelope(existingEntry, envelope);
+            return;
+        }
+        const pending = this._pendingAttachments.get(senderId);
+        if (pending) {
+            await pending.catch(() => null);
+            return;
+        }
+        const creationPromise = this._createConnectorForAttach({
+            senderId,
+            frame,
+            envelope,
+            originType: normalizedOrigin,
+        });
+        this._pendingAttachments.set(senderId, creationPromise);
+        const entry = await creationPromise.catch(() => null);
+        this._pendingAttachments.delete(senderId);
+        if (!entry) {
+            return;
+        }
+        this._senderRegistry.set(senderId, entry);
+        this._systemToSender.set(entry.systemId, senderId);
+        await this._deliverEnvelope(entry, envelope);
+    }
+    async _createConnectorForAttach(params) {
+        const routingNode = this._routingNode;
+        if (!routingNode) {
+            return null;
+        }
+        const { frame, originType } = params;
+        const systemId = frame.systemId;
+        let connectorConfig = null;
+        try {
+            const selectionContext = new GrantSelectionContext({
+                childId: systemId,
+                attachFrame: frame,
+                callbackGrantType: INPAGE_CONNECTION_GRANT_TYPE,
+                node: routingNode,
+            });
+            const selection = defaultGrantSelectionPolicy.selectCallbackGrant(selectionContext);
+            connectorConfig = this._grantToConnectorConfig(selection.grant);
+        }
+        catch (error) {
+            logger.debug('inpage_listener_grant_selection_failed', {
+                sender_id: params.senderId,
+                system_id: systemId,
+                error: error instanceof Error ? error.message : String(error),
+            });
+            connectorConfig =
+                this._extractInPageConnectorConfig(frame) ??
+                    {
+                        type: INPAGE_CONNECTOR_TYPE,
+                        channelName: this._channelName,
+                        inboxCapacity: this._inboxCapacity,
+                    };
+        }
+        try {
+            const connector = await routingNode.createOriginConnector({
+                originType,
+                systemId,
+                connectorConfig,
+            });
+            this._monitorConnectorLifecycle(params.senderId, systemId, connector);
+            logger.debug('inpage_listener_created_connector', {
+                sender_id: params.senderId,
+                system_id: systemId,
+                origin_type: originType,
+                connector_type: connector.constructor?.name ?? 'unknown',
+            });
+            return { connector, systemId, originType };
+        }
+        catch (error) {
+            logger.error('inpage_listener_connector_creation_failed', {
+                sender_id: params.senderId,
+                system_id: systemId,
+                error: error instanceof Error ? error.message : String(error),
+            });
+            return null;
+        }
+    }
+    _extractInPageConnectorConfig(frame) {
+        const rawGrants = frame.callbackGrants;
+        if (!Array.isArray(rawGrants)) {
+            return null;
+        }
+        for (const grant of rawGrants) {
+            if (grant &&
+                typeof grant === 'object' &&
+                (grant.type === INPAGE_CONNECTION_GRANT_TYPE ||
+                    grant.type === INPAGE_CONNECTOR_TYPE)) {
+                try {
+                    return inPageGrantToConnectorConfig(grant);
+                }
+                catch (error) {
+                    logger.debug('inpage_listener_grant_normalization_failed', {
+                        error: error instanceof Error ? error.message : String(error),
+                    });
+                }
+            }
+        }
+        return null;
+    }
+    _grantToConnectorConfig(grant) {
+        if (grant.type === INPAGE_CONNECTION_GRANT_TYPE) {
+            return inPageGrantToConnectorConfig(grant);
+        }
+        if (typeof grant?.toConnectorConfig === 'function') {
+            return grant.toConnectorConfig();
+        }
+        throw new Error(`Unsupported grant type: ${grant.type}`);
+    }
+    _monitorConnectorLifecycle(senderId, systemId, connector) {
+        const maybeClosable = connector;
+        if (typeof maybeClosable.waitUntilClosed !== 'function') {
+            return;
+        }
+        void maybeClosable
+            .waitUntilClosed()
+            .then(() => {
+            this._senderRegistry.delete(senderId);
+            if (this._systemToSender.get(systemId) === senderId) {
+                this._systemToSender.delete(systemId);
+            }
+        })
+            .catch((error) => {
+            logger.debug('inpage_listener_wait_until_closed_failed', {
+                sender_id: senderId,
+                system_id: systemId,
+                error: error instanceof Error ? error.message : String(error),
+            });
+            this._senderRegistry.delete(senderId);
+            if (this._systemToSender.get(systemId) === senderId) {
+                this._systemToSender.delete(systemId);
+            }
+        });
+    }
+    async _deliverEnvelope(entry, envelope) {
+        const message = this._buildChannelMessage({
+            envelope,
+            connector: entry.connector,
+            originType: entry.originType,
+            systemId: entry.systemId,
+        });
+        try {
+            await entry.connector.pushToReceive(message);
+        }
+        catch (error) {
+            if (error instanceof QueueFullError) {
+                logger.warning('inpage_listener_receive_queue_full', {
+                    system_id: entry.systemId,
+                });
+                return;
+            }
+            logger.error('inpage_listener_push_failed', {
+                system_id: entry.systemId,
+                error: error instanceof Error ? error.message : String(error),
+            });
+        }
+    }
+    _buildChannelMessage(params) {
+        const context = {
+            originType: params.originType,
+            fromConnector: params.connector,
+            fromSystemId: params.systemId,
+            expectedResponseType: FameResponseType.NONE,
+        };
+        return new FameChannelMessage(params.envelope, context);
+    }
+    _isNodeAttachFrame(frame) {
+        return Boolean(frame &&
+            typeof frame === 'object' &&
+            frame.type === 'NodeAttach');
+    }
+}
+export function getInPageListenerInstance() {
+    return _lastInPageListenerInstance;
+}
+//# sourceMappingURL=inpage-listener.js.map

package/dist/esm/naylence/fame/connector/inpage-listener.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"inpage-listener.js","sourceRoot":"","sources":["../../../../../src/naylence/fame/connector/inpage-listener.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,kBAAkB,EAClB,gBAAgB,EAChB,mBAAmB,GAKpB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAG5D,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAE9D,OAAO,EACL,qBAAqB,EACrB,2BAA2B,GAC5B,MAAM,6BAA6B,CAAC;AAErC,OAAO,EACL,4BAA4B,EAC5B,4BAA4B,GAE7B,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAEhE,MAAM,MAAM,GAAG,SAAS,CAAC,yCAAyC,CAAC,CAAC;AAEpE,MAAM,eAAe,GAAG,iBAAiB,CAAC;AAC1C,MAAM,sBAAsB,GAAG,IAAI,CAAC;AAEpC,MAAM,oBAAoB,GAAG,GAAY,EAAE,CACzC,OAAO,MAAM,KAAK,WAAW;IAC7B,OAAO,QAAQ,KAAK,WAAW;IAC/B,OAAO,WAAW,KAAK,WAAW;IAClC,OAAO,YAAY,KAAK,WAAW,CAAC;AAEtC,MAAM,wBAAwB,GAAG,GAAS,EAAE;IAC1C,IAAI,CAAC,oBAAoB,EAAE,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CAAC,qEAAqE,CAAC,CAAC;IACzF,CAAC;AACH,CAAC,CAAC;AAOF,IAAI,2BAA2B,GAA0B,IAAI,CAAC;AAQ9D,MAAM,YAAY,GAAG,GAAgB,EAAE;IACrC,wBAAwB,EAAE,CAAC;IAE3B,MAAM,aAAa,GAAG,UAErB,CAAC;IAEF,IAAI,CAAC,aAAa,CAAC,uBAAuB,EAAE,CAAC;QAC3C,aAAa,CAAC,uBAAuB,GAAG,IAAI,WAAW,EAAE,CAAC;IAC5D,CAAC;IAED,OAAO,aAAa,CAAC,uBAAsC,CAAC;AAC9D,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,GAAY,EAAqB,EAAE;IACxD,IAAI,GAAG,YAAY,UAAU,EAAE,CAAC;QAC9B,OAAO,GAAG,CAAC;IACb,CAAC;IAED,IAAI,GAAG,YAAY,WAAW,EAAE,CAAC;QAC/B,OAAO,IAAI,UAAU,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IAED,IAAI,OAAO,WAAW,KAAK,WAAW,IAAI,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;QAClE,MAAM,IAAI,GAAG,GAAsB,CAAC;QACpC,OAAO,IAAI,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IACvE,CAAC;IAED,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QACnC,MAAM,SAAS,GAAG,GAA0C,CAAC;QAC7D,IAAI,SAAS,CAAC,WAAW,EAAE,IAAI,KAAK,YAAY,EAAE,CAAC;YACjD,MAAM,IAAI,GAAG,GAAgD,CAAC;YAC9D,OAAO,IAAI,UAAU,CACnB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,CACtE,CAAC;QACJ,CAAC;IACH,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,EAAE,CAAC;QACxE,OAAO,UAAU,CAAC,IAAI,CAAC,GAAe,CAAC,CAAC;IAC1C,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,IAAc,EAA2B,EAAE,CACpE,OAAQ,IAAwB,CAAC,qBAAqB,KAAK,UAAU,CAAC;AAExE,MAAM,OAAO,cAAe,SAAQ,iBAAiB;IAenD,YAAY,OAA+B;QACzC,KAAK,EAAE,CAAC;QAbF,eAAU,GAAG,KAAK,CAAC;QACnB,iBAAY,GAAG,KAAK,CAAC;QACrB,iBAAY,GAA2B,IAAI,CAAC;QAC5C,SAAI,GAAuB,IAAI,CAAC;QAChC,gBAAW,GAAoC,IAAI,CAAC;QAC3C,oBAAe,GAAG,IAAI,GAAG,EAA0B,CAAC;QACpD,oBAAe,GAAG,IAAI,GAAG,EAAkB,CAAC;QAC5C,wBAAmB,GAAG,IAAI,GAAG,EAG3C,CAAC;QAIF,wBAAwB,EAAE,CAAC;QAE3B,MAAM,gBAAgB,GAAG,OAAO,EAAE,WAAW,CAAC;QAC9C,MAAM,cAAc,GAAG,OAAO,EAAE,aAAa,CAAC;QAE9C,IAAI,CAAC,YAAY;YACf,OAAO,gBAAgB,KAAK,QAAQ,IAAI,gBAAgB,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC;gBACxE,CAAC,CAAC,gBAAgB,CAAC,IAAI,EAAE;gBACzB,CAAC,CAAC,eAAe,CAAC;QAEtB,MAAM,kBAAkB,GACtB,OAAO,cAAc,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,cAAc,GAAG,CAAC;YACzF,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC;YAC5B,CAAC,CAAC,sBAAsB,CAAC;QAE7B,IAAI,CAAC,cAAc,GAAG,kBAAkB,CAAC;QAEzC,2BAA2B,GAAG,IAAI,CAAC;IACrC,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,IAAc;QACpC,wBAAwB,EAAE,CAAC;QAC3B,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,OAAO;QACT,CAAC;QAEH,IAAI,CAAC,YAAY,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;QACxD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QAEzB,MAAM,CAAC,KAAK,CAAC,6BAA6B,EAAE;YAC1C,OAAO,EAAE,IAAI,CAAC,YAAY;YAC1B,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,eAAe,EAAE,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC;SAC5C,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,IAAc;QAChC,wBAAwB,EAAE,CAAC;QAC3B,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,OAAO;QACT,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC;YAClD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QAC3B,CAAC;QAED,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC9B,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,OAAO,CAAC,4CAA4C,CAAC,CAAC;QAC/D,CAAC;QAED,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QAEvB,MAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE;YACtC,OAAO,EAAE,IAAI,CAAC,YAAY;SAC3B,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,KAAe;QACjC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACrB,OAAO;QACT,CAAC;QAED,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QACxB,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAC9B,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC;QAC7B,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC;QAC7B,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,CAAC;QAEjC,MAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE;YACtC,OAAO,EAAE,IAAI,CAAC,YAAY;SAC3B,CAAC,CAAC;IACL,CAAC;IAEQ,gBAAgB;QACvB,OAAO,IAAI,CAAC,uBAAuB,CAAC;YAClC,IAAI,EAAE,4BAA4B;YAClC,OAAO,EAAE,yBAAyB;YAClC,WAAW,EAAE,IAAI,CAAC,YAAY;YAC9B,aAAa,EAAE,IAAI,CAAC,cAAc;SACnC,CAAC,CAAC;IACL,CAAC;IAEQ,eAAe;QACtB,OAAO,IAAI,CAAC,uBAAuB,CAAC;YAClC,IAAI,EAAE,qBAAqB;YAC3B,WAAW,EAAE,IAAI,CAAC,YAAY;YAC9B,aAAa,EAAE,IAAI,CAAC,cAAc;SACnC,CAAC,CAAC;IACL,CAAC;IAEO,oBAAoB;QAC1B,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,OAAO;QACT,CAAC;QAED,MAAM,OAAO,GAAG,CAAC,KAAY,EAAQ,EAAE;YACrC,KAAK,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QACnC,CAAC,CAAC;QAEF,MAAM,GAAG,GAAG,YAAY,EAAE,CAAC;QAC3B,GAAG,CAAC,gBAAgB,CAAC,IAAI,CAAC,YAAY,EAAE,OAAwB,CAAC,CAAC;QAElE,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;QAChB,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC;IAC7B,CAAC;IAEO,sBAAsB;QAC5B,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACpC,OAAO;QACT,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAC3B,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,WAA4B,CAClC,CAAC;QACF,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;IAC1B,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,KAAY;QACxC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACvB,OAAO;QACT,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAC9C,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO;QACT,CAAC;QAED,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,UAAU,CAAC;QAE1C,IAAI,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAC5C,MAAM,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAClD,OAAO;QACT,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACjD,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,CAAC,KAAK,CAAC,yCAAyC,EAAE;gBACtD,SAAS,EAAE,QAAQ;gBACnB,UAAU,EAAE,QAAQ,CAAC,KAAK,EAAE,IAAI,IAAI,SAAS;aAC9C,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,MAAM,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAC/C,CAAC;IAEO,cAAc,CACpB,KAAY;QAEZ,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YACxC,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,YAAY,GAAG,KAA8B,CAAC;QACpD,MAAM,gBAAgB,GAAG,YAAY,EAAE,IAAI,CAAC;QAC5C,IAAI,CAAC,gBAAgB,IAAI,OAAO,gBAAgB,KAAK,QAAQ,EAAE,CAAC;YAC9D,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,MAAM,GAAG,gBAA6D,CAAC;QAC7E,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;QACjC,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1D,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC9C,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,CAAC,KAAK,CAAC,+CAA+C,EAAE;gBAC5D,SAAS,EAAE,QAAQ;aACpB,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,QAAsB,CAAC;QAC3B,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAClD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAA4B,CAAC;YAC9D,QAAQ,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;QACzC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,uCAAuC,EAAE;gBACpD,SAAS,EAAE,QAAQ;gBACnB,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;aAC9D,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;IAChC,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAC9B,QAAgB,EAChB,QAAsB;QAEtB,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAwB,CAAC;QAChD,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;QAChC,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1D,MAAM,CAAC,OAAO,CAAC,0CAA0C,EAAE;gBACzD,SAAS,EAAE,QAAQ;aACpB,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,MAAM,gBAAgB,GAAG,KAAK,CAAC,UAAU,IAAI,kBAAkB,CAAC,UAAU,CAAC;QAE3E,MAAM,aAAa,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACzD,IAAI,aAAa,EAAE,CAAC;YAClB,MAAM,IAAI,CAAC,gBAAgB,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;YACrD,OAAO;QACT,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACvD,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;YAChC,OAAO;QACT,CAAC;QAED,MAAM,eAAe,GAAG,IAAI,CAAC,yBAAyB,CAAC;YACrD,QAAQ;YACR,KAAK;YACL,QAAQ;YACR,UAAU,EAAE,gBAAgB;SAC7B,CAAC,CAAC;QAEH,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;QACxD,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QACtD,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAE1C,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO;QACT,CAAC;QAED,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QAC1C,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAEnD,MAAM,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAC/C,CAAC;IAEO,KAAK,CAAC,yBAAyB,CAAC,MAKvC;QACC,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC;QACtC,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC;QACrC,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;QAEhC,IAAI,eAAe,GAA2B,IAAI,CAAC;QAEnD,IAAI,CAAC;YACH,MAAM,gBAAgB,GAAG,IAAI,qBAAqB,CAAC;gBACjD,OAAO,EAAE,QAAQ;gBACjB,WAAW,EAAE,KAAK;gBAClB,iBAAiB,EAAE,4BAA4B;gBAC/C,IAAI,EAAE,WAAW;aAClB,CAAC,CAAC;YAEH,MAAM,SAAS,GACb,2BAA2B,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,CAAC;YACpE,eAAe,GAAG,IAAI,CAAC,uBAAuB,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAClE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,wCAAwC,EAAE;gBACrD,SAAS,EAAE,MAAM,CAAC,QAAQ;gBAC1B,SAAS,EAAE,QAAQ;gBACnB,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;aAC9D,CAAC,CAAC;YAEH,eAAe;gBACb,IAAI,CAAC,6BAA6B,CAAC,KAAK,CAAC;oBACxC;wBACC,IAAI,EAAE,qBAAqB;wBAC3B,WAAW,EAAE,IAAI,CAAC,YAAY;wBAC9B,aAAa,EAAE,IAAI,CAAC,cAAc;qBACR,CAAC;QACjC,CAAC;QAED,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,MAAM,WAAW,CAAC,qBAAqB,CAAC;gBACxD,UAAU;gBACV,QAAQ;gBACR,eAAe;aAChB,CAAC,CAAC;YAEH,IAAI,CAAC,0BAA0B,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;YAEtE,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE;gBAChD,SAAS,EAAE,MAAM,CAAC,QAAQ;gBAC1B,SAAS,EAAE,QAAQ;gBACnB,WAAW,EAAE,UAAU;gBACvB,cAAc,EAAE,SAAS,CAAC,WAAW,EAAE,IAAI,IAAI,SAAS;aACzD,CAAC,CAAC;YAEH,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;QAC7C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,2CAA2C,EAAE;gBACxD,SAAS,EAAE,MAAM,CAAC,QAAQ;gBAC1B,SAAS,EAAE,QAAQ;gBACnB,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;aAC9D,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAEO,6BAA6B,CACnC,KAAsB;QAEtB,MAAM,SAAS,GAAG,KAAK,CAAC,cAEX,CAAC;QACd,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YAC9B,OAAO,IAAI,CAAC;QACd,CAAC;QAED,KAAK,MAAM,KAAK,IAAI,SAAS,EAAE,CAAC;YAC9B,IACE,KAAK;gBACL,OAAO,KAAK,KAAK,QAAQ;gBACzB,CAAC,KAAK,CAAC,IAAI,KAAK,4BAA4B;oBAC1C,KAAK,CAAC,IAAI,KAAK,qBAAqB,CAAC,EACvC,CAAC;gBACD,IAAI,CAAC;oBACH,OAAO,4BAA4B,CAAC,KAAK,CAAC,CAAC;gBAC7C,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,MAAM,CAAC,KAAK,CAAC,4CAA4C,EAAE;wBACzD,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;qBAC9D,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,uBAAuB,CAAC,KAAsB;QACpD,IAAI,KAAK,CAAC,IAAI,KAAK,4BAA4B,EAAE,CAAC;YAChD,OAAO,4BAA4B,CAAC,KAAkC,CAAC,CAAC;QAC1E,CAAC;QAED,IAAI,OAAQ,KAAuD,EAAE,iBAAiB,KAAK,UAAU,EAAE,CAAC;YACtG,OAAQ,KAAsD,CAAC,iBAAiB,EAAE,CAAC;QACrF,CAAC;QAED,MAAM,IAAI,KAAK,CAAC,2BAA2B,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;IAC3D,CAAC;IAEO,0BAA0B,CAChC,QAAgB,EAChB,QAAgB,EAChB,SAAwB;QAExB,MAAM,aAAa,GAAG,SAErB,CAAC;QAEF,IAAI,OAAO,aAAa,CAAC,eAAe,KAAK,UAAU,EAAE,CAAC;YACxD,OAAO;QACT,CAAC;QAED,KAAK,aAAa;aACf,eAAe,EAAE;aACjB,IAAI,CAAC,GAAG,EAAE;YACT,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YACtC,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,QAAQ,EAAE,CAAC;gBACpD,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YACxC,CAAC;QACH,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;YACxB,MAAM,CAAC,KAAK,CAAC,0CAA0C,EAAE;gBACvD,SAAS,EAAE,QAAQ;gBACnB,SAAS,EAAE,QAAQ;gBACnB,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;aAC9D,CAAC,CAAC;YACH,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YACtC,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,QAAQ,EAAE,CAAC;gBACpD,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YACxC,CAAC;QACH,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAC5B,KAAqB,EACrB,QAAsB;QAEtB,MAAM,OAAO,GAAG,IAAI,CAAC,oBAAoB,CAAC;YACxC,QAAQ;YACR,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,UAAU,EAAE,KAAK,CAAC,UAAU;YAC5B,QAAQ,EAAE,KAAK,CAAC,QAAQ;SACzB,CAAC,CAAC;QAEH,IAAI,CAAC;YACH,MAAM,KAAK,CAAC,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAC/C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,KAAK,YAAY,cAAc,EAAE,CAAC;gBACpC,MAAM,CAAC,OAAO,CAAC,oCAAoC,EAAE;oBACnD,SAAS,EAAE,KAAK,CAAC,QAAQ;iBAC1B,CAAC,CAAC;gBACH,OAAO;YACT,CAAC;YAED,MAAM,CAAC,KAAK,CAAC,6BAA6B,EAAE;gBAC1C,SAAS,EAAE,KAAK,CAAC,QAAQ;gBACzB,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;aAC9D,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAEO,oBAAoB,CAAC,MAK5B;QACC,MAAM,OAAO,GAAwB;YACnC,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,aAAa,EAAE,MAAM,CAAC,SAAS;YAC/B,YAAY,EAAE,MAAM,CAAC,QAAQ;YAC7B,oBAAoB,EAAE,gBAAgB,CAAC,IAAI;SAC5C,CAAC;QAEF,OAAO,IAAI,kBAAkB,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC1D,CAAC;IAEO,kBAAkB,CACxB,KAA4B;QAE5B,OAAO,OAAO,CACZ,KAAK;YACH,OAAO,KAAK,KAAK,QAAQ;YACxB,KAA2B,CAAC,IAAI,KAAK,YAAY,CACrD,CAAC;IACJ,CAAC;CACF;AAED,MAAM,UAAU,yBAAyB;IACvC,OAAO,2BAA2B,CAAC;AACrC,CAAC"}

package/dist/esm/naylence/fame/delivery/default-delivery-tracker.js

@@ -145,6 +145,13 @@ export class DefaultDeliveryTracker extends TaskSpawner {
         this.replyFutures = new Map();
         this.ackDoneSince = new Map();
         this.replyDoneSince = new Map();
+        this.pendingAckDispatches = new Set();
+        this.recentlyHandled = new Map();
+        this.recentlyHandledOrder = [];
+        this.recentlyHandledTtlMs = 60000;
+        this.isPreparingToStop = false;
+        this.shutdownRequestedAtMs = null;
+        this.shutdownRetryGraceMs = 1000;
         this.futuresSweeper = null;
         this.streamQueues = new Map();
         this.streamDone = new Map();
@@ -171,6 +178,8 @@ export class DefaultDeliveryTracker extends TaskSpawner {
     }
     async onNodeStarted(node) {
         this.node = node;
+        this.isPreparingToStop = false;
+        this.shutdownRequestedAtMs = null;
         if (!this.futuresSweeper) {
             this.shutdownSignal = createDeferred();
             this.futuresSweeper = this.spawn((signal) => this.sweepFuturesLoop(signal), {
@@ -180,9 +189,14 @@ export class DefaultDeliveryTracker extends TaskSpawner {
         await this.recoverPending();
     }
     async onNodePreparingToStop(_node) {
+        this.isPreparingToStop = true;
+        this.shutdownRequestedAtMs = Date.now();
+        await this.waitForPendingAckDispatches();
         await this.waitForPendingAcks();
     }
     async onNodeStopped(_node) {
+        this.isPreparingToStop = false;
+        this.shutdownRequestedAtMs = null;
         await this.cleanup();
         await this.shutdownTasks();
     }
@@ -370,6 +384,22 @@ export class DefaultDeliveryTracker extends TaskSpawner {
                 }
             }
             else {
+                const wasRecentlyHandled = await this.lock.runExclusive(async () => this.wasRecentlyHandled(envelope.id));
+                if (wasRecentlyHandled) {
+                    logger.debug('tracker_duplicate_envelope_recently_handled', {
+                        envp_id: envelope.id,
+                    });
+                    return new TrackedEnvelope({
+                        timeoutAtMs: 0,
+                        overallTimeoutAtMs: 0,
+                        expectedResponseType: envelope.rtype ?? FameResponseType.NONE,
+                        createdAtMs: Date.now(),
+                        status: EnvelopeStatus.HANDLED,
+                        mailboxType: MailboxType.INBOX,
+                        originalEnvelope: envelope,
+                        serviceName: inboxName,
+                    });
+                }
                 tracked = new TrackedEnvelope({
                     timeoutAtMs: 0,
                     overallTimeoutAtMs: 0,
@@ -392,6 +422,11 @@ export class DefaultDeliveryTracker extends TaskSpawner {
         const inbox = this.ensureInbox();
         envelope.status = EnvelopeStatus.HANDLED;
         await inbox.delete(envelope.originalEnvelope.id);
+        await this.lock.runExclusive(async () => {
+            this.markRecentlyHandled(envelope.originalEnvelope.id);
+        });
+        // Preserve handled envelope to prevent duplicate redelivery during shutdown drains.
+        // await inbox.set(envelope.originalEnvelope.id, envelope);
     }
     async onEnvelopeHandleFailed(inboxName, envelope, context, error, isFinalFailure = false) {
         void context;
@@ -448,11 +483,30 @@ export class DefaultDeliveryTracker extends TaskSpawner {
             throw new Error('Ack frame must include refId');
         }
         const outbox = this.ensureOutbox();
-        const tracked = await outbox.get(envelope.frame.refId);
+        const refId = envelope.frame.refId;
+        const tracked = await outbox.get(refId);
         if (!tracked) {
+            let handledViaFuture = false;
+            await this.lock.runExclusive(async () => {
+                const pendingFuture = this.ackFutures.get(refId);
+                if (pendingFuture && !pendingFuture.done && pendingFuture.resolve) {
+                    pendingFuture.resolve(envelope);
+                    handledViaFuture = true;
+                }
+            });
+            if (handledViaFuture) {
+                await this.markDoneSince(this.ackFutures, refId, this.ackDoneSince);
+                await this.clearTimer(refId);
+                logger.debug('tracker_ack_resolved_without_tracked_envelope', {
+                    envp_id: envelope.id,
+                    ref_id: refId,
+                    corr_id: envelope.corrId,
+                });
+                return;
+            }
             logger.debug('tracker_ack_for_unknown_envelope', {
                 envp_id: envelope.id,
-                ref_id: envelope.frame.refId,
+                ref_id: refId,
                 corr_id: envelope.corrId,
             });
             return;
@@ -743,6 +797,8 @@ export class DefaultDeliveryTracker extends TaskSpawner {
             }
             this.streamDone.clear();
             this.correlationToEnvelope.clear();
+            this.recentlyHandled.clear();
+            this.recentlyHandledOrder.length = 0;
             return values;
         });
         for (const timer of timers) {
@@ -821,14 +877,14 @@ export class DefaultDeliveryTracker extends TaskSpawner {
         const pending = [];
         await this.lock.runExclusive(async () => {
             for (const [envelopeId, future] of this.ackFutures.entries()) {
-                if (future.promise && typeof future.promise.then === 'function') {
-                    const isDone = await Promise.race([
-                        future.promise.then(() => true, () => true),
-                        Promise.resolve(false),
-                    ]);
-                    if (!isDone) {
-                        pending.push({ envelopeId, future });
-                    }
+                if (!future || typeof future.promise?.then !== 'function') {
+                    continue;
+                }
+                if (!future.done) {
+                    logger.debug('tracker_pending_ack_future_detected', {
+                        envelope_id: envelopeId,
+                    });
+                    pending.push({ envelopeId, future });
                 }
             }
         });
@@ -881,6 +937,15 @@ export class DefaultDeliveryTracker extends TaskSpawner {
         }
         logger.debug('tracker_finished_waiting_for_pending_acks');
     }
+    async waitForPendingAckDispatches() {
+        while (this.pendingAckDispatches.size > 0) {
+            const pending = Array.from(this.pendingAckDispatches);
+            await Promise.allSettled(pending);
+            for (const promise of pending) {
+                this.pendingAckDispatches.delete(promise);
+            }
+        }
+    }
     async scheduleTimer(tracked, retryPolicy, retryHandler) {
         const outbox = this.ensureOutbox();
         const node = this.node;
@@ -935,6 +1000,18 @@ export class DefaultDeliveryTracker extends TaskSpawner {
                     }
                     if (retryPolicy &&
                         currentTracked.attempt < retryPolicy.maxRetries) {
+                        const shutdownDeferMs = this.getShutdownRetryDeferDelay(currentNowMs);
+                        if (shutdownDeferMs !== null) {
+                            const nextTimeoutAt = Math.min(currentTracked.overallTimeoutAtMs, currentNowMs + shutdownDeferMs);
+                            currentTracked.timeoutAtMs = nextTimeoutAt;
+                            await outbox.set(tracked.originalEnvelope.id, currentTracked);
+                            await this.scheduleTimer(currentTracked, retryPolicy, retryHandler);
+                            logger.debug('tracker_retry_deferred_during_shutdown', {
+                                envp_id: tracked.originalEnvelope.id,
+                                defer_ms: shutdownDeferMs,
+                            });
+                            return;
+                        }
                         currentTracked.attempt += 1;
                         const nextDelayMs = retryPolicy.nextDelayMs(currentTracked.attempt);
                         const nextRetryTime = currentNowMs + nextDelayMs;
@@ -1285,7 +1362,66 @@ export class DefaultDeliveryTracker extends TaskSpawner {
             corrId: envelope.corrId,
             traceId: envelope.traceId ?? undefined,
         });
-        await node.send(ackEnvelope);
+        const ackDispatch = node
+            .send(ackEnvelope)
+            .then(() => undefined)
+            .catch((error) => {
+            logger.error('tracker_ack_dispatch_failed', {
+                envp_id: envelope.id,
+                error: error instanceof Error ? error.message : String(error),
+            });
+            throw error;
+        });
+        this.pendingAckDispatches.add(ackDispatch);
+        try {
+            await ackDispatch;
+        }
+        finally {
+            this.pendingAckDispatches.delete(ackDispatch);
+        }
+    }
+    markRecentlyHandled(envelopeId) {
+        const now = Date.now();
+        this.recentlyHandled.set(envelopeId, now);
+        this.recentlyHandledOrder.push(envelopeId);
+        this.trimRecentlyHandled(now);
+    }
+    wasRecentlyHandled(envelopeId) {
+        const now = Date.now();
+        const timestamp = this.recentlyHandled.get(envelopeId);
+        if (timestamp === undefined) {
+            return false;
+        }
+        if (now - timestamp > this.recentlyHandledTtlMs) {
+            this.recentlyHandled.delete(envelopeId);
+            return false;
+        }
+        return true;
+    }
+    trimRecentlyHandled(now) {
+        while (this.recentlyHandledOrder.length > 0) {
+            const candidate = this.recentlyHandledOrder[0];
+            const timestamp = this.recentlyHandled.get(candidate);
+            if (timestamp === undefined) {
+                this.recentlyHandledOrder.shift();
+                continue;
+            }
+            if (now - timestamp <= this.recentlyHandledTtlMs) {
+                break;
+            }
+            this.recentlyHandled.delete(candidate);
+            this.recentlyHandledOrder.shift();
+        }
+    }
+    getShutdownRetryDeferDelay(nowMs) {
+        if (!this.isPreparingToStop || this.shutdownRequestedAtMs === null) {
+            return null;
+        }
+        const elapsed = nowMs - this.shutdownRequestedAtMs;
+        if (elapsed >= this.shutdownRetryGraceMs) {
+            return null;
+        }
+        return Math.max(0, this.shutdownRetryGraceMs - elapsed);
     }
 }
 //# sourceMappingURL=default-delivery-tracker.js.map