@zlink-systems/framework 0.29.0 → 0.30.0

package/dist/runtime/backend/node/node-raw-mesh-backend.js

@@ -12,7 +12,6 @@ const EndpointNotation_1 = require("../../../contracts/Configuration/EndpointNot
 const InternalDefaults_1 = require("../../../contracts/Configuration/InternalDefaults");
 const Registration_1 = require("../../../contracts/Configuration/Registration");
 const RegistrationBuilderPolicy_1 = require("../../../contracts/Configuration/RegistrationBuilderPolicy");
-const admission_1 = require("../../admission");
 const operation_identity_1 = require("../../foundation/operation-identity");
 const operation_registry_1 = require("../../foundation/operation-registry");
 const raw_service_mesh_runtime_1 = require("../../foundation/raw-service-mesh-runtime");
@@ -58,12 +57,11 @@ class ZLinkNodeRawMeshBackend {
     applicationJobQueue;
     applicationJobReceiveFlowFailureSink;
     peerAdmissionSealed;
+    infrastructureTaskRunner;
     nativeInstance = this;
     channels = new Map();
     peerIntents = new Map();
-    completions = [];
-    completionHead = 0;
-    completionCount = 0;
+    completionHandler;
     routingId;
     lifecycleGeneration;
     bindEndpoint;
@@ -107,12 +105,13 @@ class ZLinkNodeRawMeshBackend {
     messageFollowHandler;
     dispatchErrors;
     peerDisconnectedHandlers = new Set();
-    constructor(meshName, routingId, bindingPort, applicationJobQueue, applicationJobReceiveFlowFailureSink, peerAdmissionSealed) {
+    constructor(meshName, routingId, bindingPort, applicationJobQueue, applicationJobReceiveFlowFailureSink, peerAdmissionSealed, infrastructureTaskRunner) {
         this.meshName = meshName;
         this.bindingPort = bindingPort;
         this.applicationJobQueue = applicationJobQueue;
         this.applicationJobReceiveFlowFailureSink = applicationJobReceiveFlowFailureSink;
         this.peerAdmissionSealed = peerAdmissionSealed;
+        this.infrastructureTaskRunner = infrastructureTaskRunner;
         if (meshName.length === 0)
             throw new TypeError('MeshName must be non-empty.');
         if (routingId === undefined || routingId.length === 0) {
@@ -203,6 +202,8 @@ class ZLinkNodeRawMeshBackend {
             resolveAdvertisedEndpoint: (boundEndpoint) => this.resolveAdvertisedEndpoint(boundEndpoint),
             bindingPort: this.bindingPort,
             applicationJobQueue: this.requireApplicationJobQueue(),
+            onReceiveReady: () => this.onReadable(true, false),
+            infrastructureTaskRunner: this.infrastructureTaskRunner,
             peerAdmissionSealed: this.peerAdmissionSealed,
             onReceiveFlowConfigFailure: this.applicationJobReceiveFlowFailureSink,
             onMailboxReady: (domain) => this.readyHandler?.(domain === 'application' ? service_runtime_contracts_1.ReadyDomain.Application : service_runtime_contracts_1.ReadyDomain.Infrastructure),
@@ -275,7 +276,6 @@ class ZLinkNodeRawMeshBackend {
         this.stateful = undefined;
         this.runtime?.close();
         this.runtime = undefined;
-        this.clearCompletions();
         this.closed = true;
     }
     addChannelName(name) {
@@ -426,7 +426,7 @@ class ZLinkNodeRawMeshBackend {
             admittedPeerCount: peers.length,
             drainingPeerCount: peers.filter((peer) => peer.descriptor.state === 'draining').length,
             pendingApplicationMessages: BigInt(this.runtime?.mailbox.pendingMessages('application') ?? 0),
-            pendingInfrastructureMessages: BigInt((this.runtime?.mailbox.pendingMessages('infrastructure') ?? 0) + this.completionCount),
+            pendingInfrastructureMessages: BigInt(this.runtime?.mailbox.pendingMessages('infrastructure') ?? 0),
             pendingBytes: BigInt((this.runtime?.mailbox.pendingBytes('application') ?? 0) +
                 (this.runtime?.mailbox.pendingBytes('infrastructure') ?? 0)),
             lastError: 0,
@@ -519,6 +519,9 @@ class ZLinkNodeRawMeshBackend {
             }
         };
     }
+    setCompletionHandler(handler) {
+        this.completionHandler = handler;
+    }
     setReadyHandler(handler) {
         this.readyHandler = handler;
         this.notifyReady();
@@ -532,7 +535,6 @@ class ZLinkNodeRawMeshBackend {
     drainReady(domains, batch) {
         const target = requireRawReadyBatch(batch);
         if ((domains & service_runtime_contracts_1.ReadyDomain.Infrastructure) !== 0) {
-            this.drainCompletions(target);
             this.drainMailbox('infrastructure', target);
         }
         if ((domains & service_runtime_contracts_1.ReadyDomain.Application) !== 0) {
@@ -540,7 +542,7 @@ class ZLinkNodeRawMeshBackend {
         }
         const runtime = this.runtime;
         const infrastructureResidue = (domains & service_runtime_contracts_1.ReadyDomain.Infrastructure) !== 0 &&
-            (this.completionCount > 0 || (runtime?.mailbox.pendingMessages('infrastructure') ?? 0) > 0);
+            (runtime?.mailbox.pendingMessages('infrastructure') ?? 0) > 0;
         const applicationResidue = (domains & service_runtime_contracts_1.ReadyDomain.Application) !== 0 &&
             (runtime?.mailbox.pendingMessages('application') ?? 0) > 0;
         return {
@@ -719,7 +721,7 @@ class ZLinkNodeRawMeshBackend {
     closeActorBoundSession(actor, expectedBindingGeneration, timeoutMs = Registration_1.DEFAULT_REQUEST_TIMEOUT_MS) {
         const binding = this.requireStateful().registry.binding(actor);
         if (binding === undefined) {
-            return this.enqueueImmediateFailure(service_runtime_contracts_1.OperationKind.StreamUnbind, zlink_1.RequestResult.NotFound);
+            return this.observeImmediateFailure(service_runtime_contracts_1.OperationKind.StreamUnbind, zlink_1.RequestResult.NotFound);
         }
         return this.observeStateful(service_runtime_contracts_1.OperationKind.StreamUnbind, this.requireStateful().unbindSession(binding.sessionRid, actor, expectedBindingGeneration, timeoutMs));
     }
@@ -824,7 +826,7 @@ class ZLinkNodeRawMeshBackend {
     notifyReady() {
         const runtime = this.runtime;
         let domains = service_runtime_contracts_1.ReadyDomain.None;
-        if (this.completionCount > 0 || (runtime?.mailbox.pendingMessages('infrastructure') ?? 0) > 0) {
+        if ((runtime?.mailbox.pendingMessages('infrastructure') ?? 0) > 0) {
             domains |= service_runtime_contracts_1.ReadyDomain.Infrastructure;
         }
         if ((runtime?.mailbox.pendingMessages('application') ?? 0) > 0) {
@@ -835,61 +837,31 @@ class ZLinkNodeRawMeshBackend {
     }
     observeCompletion(low, operationKind, promise) {
         const id = { high: 1n, low };
-        void promise.then((result) => this.enqueueCompletion(id, operationKind, result), (error) => this.enqueueCompletion(id, operationKind, requestFailureResult(error)));
+        void promise.then((result) => this.deliverCompletion(id, operationKind, result), (error) => this.deliverCompletion(id, operationKind, requestFailureResult(error)));
         return id;
     }
     observeStateful(operationKind, pending) {
         const id = { high: operation_identity_1.ZLINK_NATIVE_CORRELATION_OPERATION_NAMESPACE, low: pending.id };
-        void pending.promise.then((result) => this.enqueueCompletion(id, operationKind, result), (error) => this.enqueueCompletion(id, operationKind, requestFailureResult(error)));
+        void pending.promise.then((result) => this.deliverCompletion(id, operationKind, result), (error) => this.deliverCompletion(id, operationKind, requestFailureResult(error)));
         return id;
     }
-    enqueueImmediateFailure(operationKind, terminalResult) {
+    observeImmediateFailure(operationKind, terminalResult) {
         const low = this.nextPeerIntent++;
-        const id = { high: 1n, low };
-        this.enqueueCompletion(id, operationKind, { terminalResult, failureCode: 0 });
-        return id;
+        return this.observeCompletion(low, operationKind, Promise.resolve({ terminalResult, failureCode: 0 }));
     }
-    enqueueCompletion(operationId, operationKind, result) {
-        if (this.closed)
+    deliverCompletion(operationId, operationKind, result) {
+        if (this.completionHandler !== undefined) {
+            this.completionHandler({ operationId, terminalResult: result.terminalResult }, () => completionRecord(operationId, operationKind, result));
             return;
-        this.completions.push({ operationId, operationKind, result });
-        this.completionCount += 1;
-        this.readyHandler?.(service_runtime_contracts_1.ReadyDomain.Infrastructure);
-    }
-    drainCompletions(batch) {
-        while (!batch.full && this.completionCount > 0) {
-            const completion = this.takeCompletion();
-            if (completion === undefined)
-                continue;
-            batch.push({
-                ownerKind: service_runtime_contracts_1.ReadyOwnerKind.Node,
-                domain: service_runtime_contracts_1.ReadyDomain.Infrastructure,
-                spotId: null,
-                actor: null,
-                terminalCompletion: true
-            }, new CompletionClaim(completion));
         }
-    }
-    takeCompletion() {
-        const completion = this.completions[this.completionHead];
-        if (completion === undefined)
-            return undefined;
-        this.completions[this.completionHead] = undefined;
-        this.completionHead += 1;
-        this.completionCount -= 1;
-        if (this.completionCount === 0) {
-            this.clearCompletions();
-        }
-        else if ((0, admission_1.shouldCompactBackingArray)(this.completionHead, this.completions.length)) {
-            this.completions.splice(0, this.completionHead);
-            this.completionHead = 0;
-        }
-        return completion;
-    }
-    clearCompletions() {
-        this.completions.length = 0;
-        this.completionHead = 0;
-        this.completionCount = 0;
+        // The raw pull contract uses the existing infrastructure mailbox. A
+        // registered Framework owner receives the terminal directly above.
+        this.runtime?.mailbox.tryEnqueue({
+            owner: this.routingId,
+            domain: 'infrastructure',
+            parts: [],
+            completion: completionRecord(operationId, operationKind, result)
+        });
     }
     drainMailbox(domain, batch) {
         const runtime = this.runtime;
@@ -899,7 +871,15 @@ class ZLinkNodeRawMeshBackend {
             const claim = runtime.mailbox.tryClaim(domain, MAX_DRAIN_RECORDS, Number.MAX_SAFE_INTEGER);
             if (claim === undefined)
                 break;
-            const owner = readyOwner(claim.owner, this.routingId, this.stateful, domain);
+            const owner = claim.records[0]?.completion === undefined
+                ? readyOwner(claim.owner, this.routingId, this.stateful, domain)
+                : {
+                    ownerKind: service_runtime_contracts_1.ReadyOwnerKind.Node,
+                    domain: service_runtime_contracts_1.ReadyDomain.Infrastructure,
+                    spotId: null,
+                    actor: null,
+                    terminalCompletion: true
+                };
             batch.push(owner, new MailboxClaim(runtime, claim));
         }
     }
@@ -1259,49 +1239,35 @@ class MailboxClaim {
         this.runtime.mailbox.release(this.claim, this.remaining);
     }
 }
-class CompletionClaim {
-    completion;
-    consumed = false;
-    constructor(completion) {
-        this.completion = completion;
-    }
-    recvBatch() {
-        if (this.consumed)
-            return { ok: false, records: [] };
-        this.consumed = true;
-        const payload = this.completion.result.payload;
-        return {
-            ok: true,
-            records: [
-                {
-                    kind: service_runtime_contracts_1.ReceiveKind.Completion,
-                    domain: service_runtime_contracts_1.ReadyDomain.Infrastructure,
-                    sourceNodeRid: null,
-                    sourceSpotId: null,
-                    sourceBindingGeneration: 0n,
-                    sourceActor: null,
-                    operationId: this.completion.operationId,
-                    operationKind: this.completion.operationKind,
-                    channelName: null,
-                    topic: null,
-                    applicationMetadata: null,
-                    kindData: 'kindData' in this.completion.result ? (this.completion.result.kindData ?? null) : null,
-                    terminalResult: this.completion.result.terminalResult,
-                    failureErrno: this.completion.result.failureCode,
-                    parts: payload === undefined
-                        ? []
-                        : payload.contentType === MULTIPART_CONTENT_TYPE
-                            ? decodeMultipart(payload.payload)
-                            : [zlink_1.Message.from(payload.payload)],
-                    reply: () => zlink_1.SubmitResult.InvalidState,
-                    replyActorJoin: () => zlink_1.SubmitResult.NotSupported
-                }
-            ]
-        };
-    }
-    release() { }
+function completionRecord(operationId, operationKind, result) {
+    const payload = result.payload;
+    return {
+        kind: service_runtime_contracts_1.ReceiveKind.Completion,
+        domain: service_runtime_contracts_1.ReadyDomain.Infrastructure,
+        sourceNodeRid: null,
+        sourceSpotId: null,
+        sourceBindingGeneration: 0n,
+        sourceActor: null,
+        operationId,
+        operationKind,
+        channelName: null,
+        topic: null,
+        applicationMetadata: null,
+        kindData: 'kindData' in result ? (result.kindData ?? null) : null,
+        terminalResult: result.terminalResult,
+        failureErrno: result.failureCode,
+        parts: payload === undefined
+            ? []
+            : payload.contentType === MULTIPART_CONTENT_TYPE
+                ? decodeMultipart(payload.payload)
+                : [runtime_message_1.ZLinkBufferMessage.from(payload.payload)],
+        reply: () => zlink_1.SubmitResult.InvalidState,
+        replyActorJoin: () => zlink_1.SubmitResult.NotSupported
+    };
 }
 function decodeMultipartRecord(runtime, record) {
+    if (record.completion !== undefined)
+        return record.completion;
     const stateful = (0, service_stateful_runtime_1.statefulMailboxData)(record);
     if (stateful !== undefined) {
         return decodeStatefulRecord(record, stateful);

package/dist/runtime/backend/node/node-socket-backend-adapter.js

@@ -10,6 +10,8 @@ const node_event_loop_poller_1 = require("./node-event-loop-poller");
 const eventLoopPollers = new WeakMap();
 function wrapSocket(nativeInstance, pollCompletion) {
     const socket = nativeInstance;
+    if (socket.options !== undefined)
+        socket.options.linger = 0;
     const hasRequest = typeof nativeInstance.request === 'function';
     const hasRoutedPeer = hasRequest && typeof nativeInstance.reply === 'function';
     const hasStream = typeof nativeInstance.recvPacket === 'function';
@@ -18,9 +20,9 @@ function wrapSocket(nativeInstance, pollCompletion) {
         : new node_event_loop_poller_1.ZLinkNodeEventLoopPoller(nativeInstance, pollCompletion, () => { });
     const adapter = {
         nativeInstance,
+        receiveAdmission: undefined,
         async dispose() {
             eventLoopPoller?.dispose();
-            (0, node_backend_adapter_support_1.disableSocketLinger)(nativeInstance);
             (0, node_backend_adapter_support_1.closeBindingHandle)(nativeInstance);
         },
         close() {
@@ -44,9 +46,6 @@ function wrapSocket(nativeInstance, pollCompletion) {
                 .setChannelName;
             setChannelName?.call(nativeInstance, channelName);
         },
-        setReceiveFlowState(state) {
-            nativeInstance.setReceiveFlowState(state);
-        },
         setProbe(enabled) {
             requireSocketOptions(socket).probe = enabled;
         },
@@ -68,6 +67,12 @@ function wrapSocket(nativeInstance, pollCompletion) {
         setRoutingId(routingId) {
             nativeInstance.setRoutingId((0, node_backend_adapter_support_1.toNativeRoutingId)(routingId));
         },
+        get lingerMs() {
+            return requireSocketOptions(socket).linger;
+        },
+        set lingerMs(value) {
+            requireSocketOptions(socket).linger = value;
+        },
         get peerWeight() {
             return socket.options?.peerWeight ?? RegistrationBuilderPolicy_1.ZLINK_DEFAULT_PUBLIC_WEIGHT;
         },
@@ -144,7 +149,7 @@ function wrapSocket(nativeInstance, pollCompletion) {
             }
             if (hasRequest) {
                 const [payload, timeoutMs] = args;
-                return (0, node_backend_adapter_support_1.submitBindingRequest)(nativeInstance.request(), payload, timeoutMs);
+                return (0, node_backend_adapter_support_1.submitBindingRequest)(nativeInstance.request(), payload, timeoutMs, adapter.receiveAdmission?.recordReceived);
             }
             throw new TypeError('Backend request requires a DEALER or ROUTER socket.');
         },

package/dist/runtime/backend/raw-binding-port.d.ts

@@ -1,3 +1,8 @@
+import type { SubmitResult } from './runtime-values';
+export interface ZLinkRawSendSubmission {
+    readonly result: typeof SubmitResult.Ok | typeof SubmitResult.Backpressured;
+    readonly admitted: Promise<void>;
+}
 export interface ZLinkRawReceivedRecord {
     readonly sourceRid: string;
     readonly sourceRoute: Uint8Array;
@@ -29,7 +34,6 @@ export interface ZLinkRawSocketPort {
     unbind(endpoint: string): void;
     connect(endpoint: string): void;
     disconnect(endpoint: string): void;
-    setReceiveFlowState(state: 'running' | 'paused'): void;
     monitor(): ZLinkRawMonitorPort;
     close(): void;
 }
@@ -44,12 +48,15 @@ export interface ZLinkRawRouterRoute {
     readonly routeGeneration: bigint;
 }
 export interface ZLinkRawRouterPort extends ZLinkRawSocketPort {
+    setReceiveFlowState(state: 'running' | 'paused'): void;
+    /** Reports Core submit synchronously; admitted observes only pending admission. */
+    submitSend(targetRid: string, parts: readonly Uint8Array[]): ZLinkRawSendSubmission;
     disconnectRid?(routingId: string): void;
     localEndpoint(): string;
     setRoutingId(routingId: string): void;
     connectToRoutingId(routingId: string, endpoint: string): void;
     send(targetRid: string, parts: readonly Uint8Array[]): Promise<void>;
-    request(targetRid: string, parts: readonly Uint8Array[], timeoutMs: number): Promise<readonly Buffer[]>;
+    request(targetRid: string, parts: readonly Uint8Array[], timeoutMs: number, recordReceived?: () => void): Promise<readonly Buffer[]>;
     receive(dontWait?: boolean): ZLinkRawReceivedRecord | undefined;
     /** The selected route of every RID. The socket's one route observer calls it. */
     routesSnapshot(): readonly ZLinkRawRouterRoute[];

package/dist/runtime/channels/channel-receive-loops.js

@@ -258,7 +258,7 @@ class ZLinkChannelReceiveLoop {
     }
     async acquirePermit(signal) {
         try {
-            return await this.applicationJobQueue.acquire(signal);
+            return await this.applicationJobQueue.acquire(signal, 'remote');
         }
         catch (error) {
             if (this.isStopped() || signal.aborted)
@@ -448,7 +448,7 @@ class ZLinkSubscriberReceiveLoop {
     }
     async acquirePermit(signal) {
         try {
-            return await this.applicationJobQueue.acquire(signal);
+            return await this.applicationJobQueue.acquire(signal, 'remote');
         }
         catch (error) {
             if (this.isStopped() || signal.aborted)
@@ -640,7 +640,7 @@ class ZLinkRouteReceiveLoop {
     }
     async acquirePermit(signal) {
         try {
-            return await this.applicationJobQueue.acquire(signal);
+            return await this.applicationJobQueue.acquire(signal, 'remote');
         }
         catch (error) {
             if (this.isStopped() || signal.aborted)

package/dist/runtime/channels/channel-runtime-lifecycle.js

@@ -332,7 +332,8 @@ class ZLinkChannelRuntimeLifecycle {
                 unhandled: this.options.registration.dispatch?.unhandled
             });
             const spotRouteBridge = this.createSpotRouteBridgeForRouter(channelName, router);
-            const loop = new channel_receive_loops_1.ZLinkChannelReceiveLoop(channelName, router, dispatcher, spotRouteBridge, (received, socket) => this.options.sockets.tryHandleClientServerControl(channelName, received, socket), this.options.adapter.createReadablePoller(router), this.options.applicationJobQueue, (error) => taskRunner.errorSink.reportRuntimeTaskException(`channel:${channelName}:dispatch`, error), this.receiveRoundRobin, this.applicationDispatchQueue(channelName));
+            const serverPeers = this.options.sockets.clientServerServerPeersForChannel(channelName);
+            const loop = new channel_receive_loops_1.ZLinkChannelReceiveLoop(channelName, router, dispatcher, spotRouteBridge, (received, socket) => this.options.sockets.tryHandleClientServerControl(channelName, received, socket, serverPeers), this.options.adapter.createReadablePoller(router), this.options.applicationJobQueue, (error) => taskRunner.errorSink.reportRuntimeTaskException(`channel:${channelName}:dispatch`, error), this.receiveRoundRobin, this.applicationDispatchQueue(channelName));
             this.channelReceiveLoops.push(loop);
             tasks.push(taskRunner.run(`channel:${channelName}`, (signal) => loop.run(signal)));
         }

package/dist/runtime/channels/channel-socket-registry.d.ts

@@ -1,9 +1,10 @@
-import { type ZLinkClientServerServerDescriptor, type ZLinkFanoutPublisherDescriptor } from '../../contracts';
+import { type RoutingId, type ZLinkClientServerServerDescriptor, type ZLinkFanoutPublisherDescriptor } from '../../contracts';
 import type { Message } from '../../contracts/Common/Message';
 import type { ZLinkBackendContext, ZLinkBackendDealerSocket, ZLinkBackendPublisherSocket, ZLinkBackendRouterSocket, ZLinkBackendSocketMonitor, ZLinkBackendSubscriberSocket, ZLinkChannelBackendAdapter, ZLinkMonitoringBackendAdapter } from '../backend/contracts';
 import { type ZLinkFrameworkRegistration } from '../configuration';
 import { ZLinkListenerRecords } from '../foundation/listener-records';
 import { ServiceDiscoveryRegistry } from '../foundation/service-discovery-registry';
+import { ServiceLivenessConnection } from '../foundation/service-liveness-registry';
 import type { ApplicationJobQueue } from '../host/application-job-queue';
 import type { ZLinkChannelEnvelopeHeader } from './channel-envelope';
 export interface ZLinkClientServerServerSocketIdentity {
@@ -20,6 +21,12 @@ export interface ZLinkFanoutConnectionCallbacks {
     readonly onReady: () => void;
     readonly onTerminated: (reason: 'disconnect' | 'deadline' | 'protocol') => void;
 }
+interface ClientServerServerPeer {
+    readonly channelName: string;
+    readonly routingId: RoutingId;
+    readonly normalizedEffectiveMaxMessageBytes: number;
+    readonly liveness: ServiceLivenessConnection;
+}
 export declare class ZLinkChannelSocketRegistry {
     private readonly registration;
     private readonly adapter;
@@ -39,7 +46,6 @@ export declare class ZLinkChannelSocketRegistry {
     private readonly clientServerServerDescriptors;
     private readonly clientServerPublicWeights;
     private readonly routeMeshPublicWeights;
-    private readonly clientServerAdmittedClients;
     private readonly clientServerServerPeers;
     private readonly disposal;
     private readonly ownedResources;
@@ -83,11 +89,12 @@ export declare class ZLinkChannelSocketRegistry {
     removeFanoutPublisher(descriptor: ZLinkFanoutPublisherDescriptor, connectionId: string): boolean;
     setClientServerServerDescriptor(descriptor: ZLinkClientServerServerDescriptor | undefined, channelName: string): void;
     private notifyClientServerTopology;
+    clientServerServerPeersForChannel(channelName: string): Map<RoutingId, ClientServerServerPeer>;
     tryHandleClientServerControl(channelName: string, received: {
         readonly parts: readonly Message[];
         readonly replyToken: unknown | null;
         readonly routingId: unknown;
-    }, router: ZLinkBackendRouterSocket): boolean;
+    }, router: ZLinkBackendRouterSocket, peers?: Map<string, ClientServerServerPeer>): boolean;
     tickClientServerLiveness(nowMs?: number): void;
     openFanoutSubscriberConnection(channelName: string, connectionId: string, endpoint: string, callbacks: ZLinkFanoutConnectionCallbacks): ZLinkBackendSubscriberSocket;
     closeFanoutSubscriberConnection(connectionId: string): Promise<void>;