@zlink-systems/framework 0.25.0 → 0.27.0

package/dist/runtime/foundation/service-stateful-wire-codec.js

@@ -36,14 +36,21 @@ exports.decodeServiceWireFrozenRecord = decodeServiceWireFrozenRecord;
 exports.decodeServiceWireFrozenRecordPrefix = decodeServiceWireFrozenRecordPrefix;
 exports.encodeServiceWireFrozenRecord = encodeServiceWireFrozenRecord;
 exports.encodeServiceWireFrozenActorApplicationRecord = encodeServiceWireFrozenActorApplicationRecord;
-const service_runtime_contracts_1 = require("./service-runtime-contracts");
-const service_wire_m6a_codec_1 = require("./service-wire-m6a-codec");
+const stream_wire_1 = require("@zlink-systems/stream-wire");
+const InternalDefaults_1 = require("../../contracts/Configuration/InternalDefaults");
 const framework_errors_internal_1 = require("../framework-errors-internal");
+const service_wire_codec_generated_1 = require("../protocol/service_wire_codec.generated");
+const service_wire_pilot_codec_generated_1 = require("../protocol/service_wire_pilot_codec.generated");
 const routing_id_1 = require("../routing-id");
-const service_wire_constants_generated_1 = require("./service-wire-constants.generated");
+const service_runtime_contracts_1 = require("./service-runtime-contracts");
 const service_wire_binary_primitives_1 = require("./service-wire-binary-primitives");
-const service_wire_pilot_codec_generated_1 = require("../protocol/service_wire_pilot_codec.generated");
-const PREFIX_SIZE = 5;
+const service_wire_constants_generated_1 = require("./service-wire-constants.generated");
+const service_wire_m6a_codec_1 = require("./service-wire-m6a-codec");
+const MESSAGE_FOLLOW_MAX_BODY_BYTES = 16 * 1024 * 1024;
+const MESSAGE_FOLLOW_VERSION = 1;
+const INSTANCE_ROUTE_VERSION = 1;
+const INSTANCE_ACTIVATION_VERSION = 2;
+const PREFIX_SIZE = service_wire_binary_primitives_1.SERVICE_WIRE_PREFIX_SIZE;
 const MAGIC_0 = service_wire_constants_generated_1.SERVICE_WIRE_MAGIC[0];
 const MAGIC_1 = service_wire_constants_generated_1.SERVICE_WIRE_MAGIC[1];
 const MAJOR = service_wire_constants_generated_1.SERVICE_WIRE_MAJOR;
@@ -51,7 +58,8 @@ exports.M6bServiceWireCommand = service_wire_constants_generated_1.ServiceWireCo
 /** Shared CRC-32C wire bounds for the direct relocation payload transfer. */
 exports.RELOCATION_PAYLOAD_TOTAL_LENGTH_MAX = 274877906944n;
 exports.RELOCATION_PAYLOAD_CHUNK_COUNT_MAX = 4096;
-exports.RELOCATION_STATE_CHUNK_DATA_MAX_BYTES = 67_108_864;
+var InternalDefaults_2 = require("../../contracts/Configuration/InternalDefaults");
+Object.defineProperty(exports, "RELOCATION_STATE_CHUNK_DATA_MAX_BYTES", { enumerable: true, get: function () { return InternalDefaults_2.RELOCATION_STATE_CHUNK_DATA_MAX_BYTES; } });
 exports.M6bServiceWireFlag = service_wire_constants_generated_1.ServiceWireFlag;
 function serviceSessionRelocationIdentityKey(value) {
     const actor = 'targetNodeGeneration' in value.actor ? value.actor.actor : value.actor;
@@ -491,20 +499,85 @@ function fromGeneratedReplyRelay(value) {
             })
     };
 }
-function encodeSpotHeader(kind, sourceSpotId, target, correlation) {
-    return concat(prefix(kind === 'spotSend' ? exports.M6bServiceWireCommand.spotSend : exports.M6bServiceWireCommand.spotRequest), ...(kind === 'spotRequest' ? [u64(requirePositive(correlation, 'correlation'))] : []), rid(sourceSpotId, 'sourceSpotId'), directSpotFence(target));
+const STATEFUL_MESSAGE_CONTEXT = {
+    effectiveCompleteMessageBytesMinusActualEnvelopeOverhead: 0xffff_fdf6,
+    effectiveCompleteMessageBytes: 0xffff_ffff
+};
+const STATEFUL_HEADER_PAYLOAD = {
+    packetName: 'wire',
+    contentType: stream_wire_1.ZlinkStreamContentType.Json,
+    payload: Buffer.from('{}')
+};
+function generatedSpotFence(target) {
+    return {
+        spot: { spotId: target.spot.spotId, objectGeneration: target.spot.generation },
+        targetNodeRid: toGeneratedRoutingId(target.targetNodeRid, 'targetNodeRid'),
+        targetNodeGeneration: target.targetNodeGeneration,
+        expectedAuthorityOwnerGeneration: target.authorityOwnerGeneration,
+        expectedOwnerLeaseGeneration: target.ownerLeaseGeneration
+    };
+}
+function generatedActorFence(target) {
+    return {
+        actor: { actorId: target.actor.actorId, objectGeneration: target.actor.generation },
+        targetNodeRid: toGeneratedRoutingId(target.actor.nodeRid, 'targetNodeRid'),
+        targetNodeGeneration: target.targetNodeGeneration,
+        expectedAuthorityOwnerGeneration: target.authorityOwnerGeneration,
+        expectedOwnerLeaseGeneration: target.ownerLeaseGeneration
+    };
 }
-function encodeActorHeader(kind, target, correlation, sourceActor, boundSession) {
+function encodeSpotHeader(kind, sourceSpotId, target, correlation, operation = { high: 0n, low: 1n }, messageFollowHopCount = 0, metadataFrame) {
+    const common = {
+        flags: metadataFrame === undefined ? 0 : exports.M6bServiceWireFlag.metadata,
+        operation,
+        messageFollowHopCount,
+        sourceSpotId,
+        targetSpot: generatedSpotFence(target),
+        payload: STATEFUL_HEADER_PAYLOAD,
+        ...(metadataFrame === undefined
+            ? {}
+            : { metadata: (0, service_wire_codec_generated_1.decodeMetadataFrame)(metadataFrame, STATEFUL_MESSAGE_CONTEXT) })
+    };
+    const frames = kind === 'spotSend'
+        ? (0, service_wire_codec_generated_1.encodeSpotSendCommand)({ command: kind, ...common }, STATEFUL_MESSAGE_CONTEXT)
+        : (0, service_wire_codec_generated_1.encodeSpotRequestCommand)({
+            command: kind,
+            ...common,
+            correlation: requirePositive(correlation, 'correlation')
+        }, STATEFUL_MESSAGE_CONTEXT);
+    return Buffer.from(frames[0]);
+}
+function encodeActorHeader(kind, target, correlation, sourceActor, boundSession, operation = { high: 0n, low: 1n }, messageFollowHopCount = 0) {
     const flags = boundSession === undefined
         ? 0
         : exports.M6bServiceWireFlag.boundSession | exports.M6bServiceWireFlag.sourceSpotId;
-    return concat(prefix(kind === 'actorSend' ? exports.M6bServiceWireCommand.actorSend : exports.M6bServiceWireCommand.actorRequest, flags), ...(kind === 'actorRequest' ? [u64(requirePositive(correlation, 'correlation'))] : []), optionalActor(sourceActor), actorFence(target), ...(boundSession === undefined
-        ? []
-        : [
-            rid(boundSession.sessionRid, 'sourceSessionRid'),
-            u64(boundSession.bindingGeneration),
-            u64(boundSession.sequence)
-        ]));
+    const common = {
+        flags,
+        operation,
+        messageFollowHopCount,
+        sourceActor: sourceActor === undefined
+            ? { actorId: null }
+            : { actorId: sourceActor.actorId, generation: sourceActor.generation },
+        targetActor: generatedActorFence(target),
+        ...(boundSession === undefined
+            ? {}
+            : {
+                boundSessionTail: {
+                    sourceSessionRid: toGeneratedRoutingId(boundSession.sessionRid, 'sourceSessionRid'),
+                    sourceBindingGeneration: boundSession.bindingGeneration,
+                    sourceSessionSequence: boundSession.sequence
+                }
+            }),
+        payload: STATEFUL_HEADER_PAYLOAD
+    };
+    const frames = kind === 'actorSend'
+        ? (0, service_wire_codec_generated_1.encodeActorSendCommand)({ command: kind, ...common }, STATEFUL_MESSAGE_CONTEXT)
+        : (0, service_wire_codec_generated_1.encodeActorRequestCommand)({
+            command: kind,
+            ...common,
+            correlation: requirePositive(correlation, 'correlation')
+        }, STATEFUL_MESSAGE_CONTEXT);
+    return Buffer.from(frames[0]);
 }
 function encodeLogicalMulticastHeader(channelName, topic, sourceSpotId) {
     return concat(prefix(exports.M6bServiceWireCommand.logicalMulticast), text8(channelName, 'channelName'), text8(topic, 'topic'), rid(sourceSpotId, 'sourceSpotId'));
@@ -549,8 +622,21 @@ function encodeSessionRelocationRoute(value) {
 function decodeSessionRelocationRoute(frame) {
     return fromGeneratedSessionRelocationRoute((0, service_wire_pilot_codec_generated_1.decodeSessionRelocationRoute44)(frame));
 }
-function encodeInstanceSpotHeader(route, sourceNodeGeneration, sourceNodeRid, sourceSpotId, operationKind, operation, replyRouteId, hasMetadata = false) {
-    const routeBody = concat(rid(route.targetNodeRid, 'targetNodeRid'), u64(route.targetNodeGeneration), rid(route.targetSpotId, 'targetSpotId'), u64(route.objectGeneration), text8(route.ownerId, 'ownerId'), u64(route.authorityOwnerGeneration), u64(route.leaseGeneration), text16(route.storeVersion, 'storeVersion'));
+function encodeInstanceSpotHeader(route, sourceNodeGeneration, sourceNodeRid, sourceSpotId, operationKind, operation, replyRouteId, hasMetadata = false, instanceIntent = false) {
+    const encodedRoute = (0, service_wire_codec_generated_1.encodeInstanceRouteV1)({
+        routeKind: 'ready',
+        targetNodeRid: toGeneratedRoutingId(route.targetNodeRid, 'targetNodeRid'),
+        targetNodeGeneration: route.targetNodeGeneration,
+        targetSpotId: route.targetSpotId,
+        authority: {
+            objectGeneration: route.objectGeneration,
+            ownerId: route.ownerId,
+            authorityOwnerGeneration: route.authorityOwnerGeneration,
+            leaseGeneration: route.leaseGeneration,
+            storeVersion: route.storeVersion
+        },
+        instanceIntent: instanceIntent ? 'true' : 'false'
+    }, STATEFUL_MESSAGE_CONTEXT);
     if (operationKind === 'send' &&
         (operation.high !== 0n || operation.low !== 0n || replyRouteId !== undefined)) {
         throw new RangeError('Instance Spot send must not carry an operation or reply route.');
@@ -558,7 +644,7 @@ function encodeInstanceSpotHeader(route, sourceNodeGeneration, sourceNodeRid, so
     if (operationKind === 'request' && operation.high === 0n && operation.low === 0n) {
         throw new RangeError('Instance Spot request requires a non-zero operation.');
     }
-    return concat(prefix(exports.M6bServiceWireCommand.instanceSpot, hasMetadata ? exports.M6bServiceWireFlag.metadata : 0), Buffer.of(1), u16(routeBody.byteLength), routeBody, u64Any(sourceNodeGeneration), rid(sourceNodeRid, 'sourceNodeRid'), optionalRid(sourceSpotId), Buffer.of(operationKind === 'send' ? 1 : 2), u64Any(operation.high), u64Any(operation.low), ...(operationKind === 'request' ? [u64(requirePositive(replyRouteId, 'replyRouteId'))] : []));
+    return concat(prefix(exports.M6bServiceWireCommand.instanceSpot, hasMetadata ? exports.M6bServiceWireFlag.metadata : 0), encodedRoute, u64Any(sourceNodeGeneration), rid(sourceNodeRid, 'sourceNodeRid'), optionalRid(sourceSpotId), Buffer.of(operationKind === 'send' ? 1 : 2), u64Any(operation.high), u64Any(operation.low), ...(operationKind === 'request' ? [u64(requirePositive(replyRouteId, 'replyRouteId'))] : []));
 }
 function encodeInstanceSpotActivationHeader(target, sourceNodeGeneration, sourceNodeRid, sourceSpotId, operationKind, operation, deadlineUnixMs, replyRouteId, hasMetadata = false) {
     if (operation.high === 0n && operation.low === 0n) {
@@ -571,7 +657,7 @@ function encodeInstanceSpotActivationHeader(target, sourceNodeGeneration, source
         throw new RangeError('Instance Spot send must not carry a reply route.');
     }
     const targetBody = concat(rid(target.targetNodeRid, 'targetNodeRid'), u64(target.targetNodeGeneration), rid(target.targetSpotId, 'targetSpotId'), text16(target.stableType, 'stableType'), text16(target.descriptorVersion, 'descriptorVersion'));
-    return concat(prefix(exports.M6bServiceWireCommand.instanceSpot, hasMetadata ? exports.M6bServiceWireFlag.metadata : 0), Buffer.of(2), u16(targetBody.byteLength), targetBody, u64Any(sourceNodeGeneration), rid(sourceNodeRid, 'sourceNodeRid'), optionalRid(sourceSpotId), Buffer.of(operationKind === 'send' ? 1 : 2), u64Any(operation.high), u64Any(operation.low), u64(deadlineUnixMs), ...(operationKind === 'request' ? [u64(requirePositive(replyRouteId, 'replyRouteId'))] : []));
+    return concat(prefix(exports.M6bServiceWireCommand.instanceSpot, hasMetadata ? exports.M6bServiceWireFlag.metadata : 0), Buffer.of(INSTANCE_ACTIVATION_VERSION), u16(targetBody.byteLength), targetBody, u64Any(sourceNodeGeneration), rid(sourceNodeRid, 'sourceNodeRid'), optionalRid(sourceSpotId), Buffer.of(operationKind === 'send' ? 1 : 2), u64Any(operation.high), u64Any(operation.low), u64(deadlineUnixMs), ...(operationKind === 'request' ? [u64(requirePositive(replyRouteId, 'replyRouteId'))] : []));
 }
 function encodeUserSpotCreateHeader(record) {
     return Buffer.from((0, service_wire_pilot_codec_generated_1.encodeUserSpotCreate47)(toGeneratedUserSpotCreate(record)));
@@ -585,12 +671,12 @@ function encodeUserSpotCloseHeader(record) {
 function encodeMessageFollowHeader(record) {
     validateMessageFollowRecord(record);
     const body = concat(messageFollowRoute(record.source), messageFollowRoute(record.target), Buffer.of(record.hopCount), u32(record.queuedMessages, 'queuedMessages'), u32(record.queuedBytes, 'queuedBytes'), u64Any(record.originalOperation.high), u64Any(record.originalOperation.low), u64Any(record.originalReplyRouteId));
-    if (body.byteLength > 16 * 1024 * 1024) {
-        throw new RangeError('Message Follow body exceeds 16 MiB.');
+    if (body.byteLength > MESSAGE_FOLLOW_MAX_BODY_BYTES) {
+        throw new RangeError(`Message Follow body exceeds ${MESSAGE_FOLLOW_MAX_BODY_BYTES / (1024 * 1024)} MiB.`);
     }
-    return concat(prefix(exports.M6bServiceWireCommand.messageFollow), Buffer.of(1), u32(body.byteLength, 'messageFollow.length'), body);
+    return concat(prefix(exports.M6bServiceWireCommand.messageFollow), Buffer.of(MESSAGE_FOLLOW_VERSION), u32(body.byteLength, 'messageFollow.length'), body);
 }
-function decodeStatefulHeader(frame) {
+function decodeStatefulHeader(frame, payloadFrame, metadataFrame) {
     switch (frame[3]) {
         case exports.M6bServiceWireCommand.userSpotCreate:
             return fromGeneratedUserSpotCreate((0, service_wire_pilot_codec_generated_1.decodeUserSpotCreate47)(frame));
@@ -598,49 +684,87 @@ function decodeStatefulHeader(frame) {
             return fromGeneratedUserSpotClose((0, service_wire_pilot_codec_generated_1.decodeUserSpotClose48)(frame));
         case exports.M6bServiceWireCommand.actorCreate:
             return fromGeneratedActorCreate((0, service_wire_pilot_codec_generated_1.decodeActorCreate49)(frame));
-    }
-    const reader = new Reader(frame);
-    const command = reader.prefix();
-    switch (command.command) {
         case exports.M6bServiceWireCommand.spotSend:
-        case exports.M6bServiceWireCommand.spotRequest: {
-            requireFlags(command.flags, 0);
-            const request = command.command === exports.M6bServiceWireCommand.spotRequest;
-            const correlation = request ? reader.nonZeroU64('correlation') : undefined;
-            const sourceSpotId = reader.rid('sourceSpotId');
-            const target = reader.directSpotFence();
-            reader.end();
-            return {
-                kind: request ? 'spotRequest' : 'spotSend',
-                ...(correlation === undefined ? {} : { correlation }),
-                sourceSpotId,
-                target
-            };
-        }
+        case exports.M6bServiceWireCommand.spotRequest:
         case exports.M6bServiceWireCommand.actorSend:
         case exports.M6bServiceWireCommand.actorRequest: {
-            const request = command.command === exports.M6bServiceWireCommand.actorRequest;
-            const hasBinding = command.flags !== 0;
-            requireFlags(command.flags, hasBinding ? exports.M6bServiceWireFlag.boundSession | exports.M6bServiceWireFlag.sourceSpotId : 0);
-            const correlation = request ? reader.nonZeroU64('correlation') : undefined;
-            const sourceActor = reader.optionalActor();
-            const target = reader.actorFence();
-            const boundSession = hasBinding
-                ? {
-                    sessionRid: reader.rid('sourceSessionRid'),
-                    bindingGeneration: reader.nonZeroU64('sourceBindingGeneration'),
-                    sequence: reader.nonZeroU64('sourceSessionSequence')
+            const frames = [
+                frame,
+                ...(metadataFrame === undefined ? [] : [metadataFrame]),
+                payloadFrame ??
+                    (0, service_wire_codec_generated_1.encodeApplicationPayloadEnvelopeV1)(STATEFUL_HEADER_PAYLOAD, STATEFUL_MESSAGE_CONTEXT)
+            ];
+            try {
+                if (frame[3] === exports.M6bServiceWireCommand.spotSend ||
+                    frame[3] === exports.M6bServiceWireCommand.spotRequest) {
+                    const decoded = frame[3] === exports.M6bServiceWireCommand.spotSend
+                        ? (0, service_wire_codec_generated_1.decodeSpotSendCommand)(frames, STATEFUL_MESSAGE_CONTEXT)
+                        : (0, service_wire_codec_generated_1.decodeSpotRequestCommand)(frames, STATEFUL_MESSAGE_CONTEXT);
+                    return {
+                        kind: decoded.command,
+                        ...(decoded.command === 'spotRequest' ? { correlation: decoded.correlation } : {}),
+                        operation: decoded.operation,
+                        messageFollowHopCount: decoded.messageFollowHopCount,
+                        sourceSpotId: decoded.sourceSpotId,
+                        target: {
+                            spot: {
+                                spotId: decoded.targetSpot.spot.spotId,
+                                generation: decoded.targetSpot.spot.objectGeneration
+                            },
+                            targetNodeRid: fromGeneratedRoutingId(decoded.targetSpot.targetNodeRid, 'targetNodeRid'),
+                            targetNodeGeneration: decoded.targetSpot.targetNodeGeneration,
+                            authorityOwnerGeneration: decoded.targetSpot.expectedAuthorityOwnerGeneration,
+                            ownerLeaseGeneration: decoded.targetSpot.expectedOwnerLeaseGeneration
+                        }
+                    };
                 }
-                : undefined;
-            reader.end();
-            return {
-                kind: request ? 'actorRequest' : 'actorSend',
-                ...(correlation === undefined ? {} : { correlation }),
-                ...(sourceActor === undefined ? {} : { sourceActor }),
-                target,
-                ...(boundSession === undefined ? {} : { boundSession })
-            };
+                const decoded = frame[3] === exports.M6bServiceWireCommand.actorSend
+                    ? (0, service_wire_codec_generated_1.decodeActorSendCommand)(frames, STATEFUL_MESSAGE_CONTEXT)
+                    : (0, service_wire_codec_generated_1.decodeActorRequestCommand)(frames, STATEFUL_MESSAGE_CONTEXT);
+                const source = decoded.sourceActor;
+                return {
+                    kind: decoded.command,
+                    ...(decoded.command === 'actorRequest' ? { correlation: decoded.correlation } : {}),
+                    operation: decoded.operation,
+                    messageFollowHopCount: decoded.messageFollowHopCount,
+                    ...(source.actorId === null
+                        ? {}
+                        : {
+                            sourceActor: {
+                                nodeRid: '',
+                                actorId: source.actorId,
+                                generation: source.generation
+                            }
+                        }),
+                    target: {
+                        actor: {
+                            nodeRid: fromGeneratedRoutingId(decoded.targetActor.targetNodeRid, 'targetNodeRid'),
+                            actorId: decoded.targetActor.actor.actorId,
+                            generation: decoded.targetActor.actor.objectGeneration
+                        },
+                        targetNodeGeneration: decoded.targetActor.targetNodeGeneration,
+                        authorityOwnerGeneration: decoded.targetActor.expectedAuthorityOwnerGeneration,
+                        ownerLeaseGeneration: decoded.targetActor.expectedOwnerLeaseGeneration
+                    },
+                    ...(decoded.boundSessionTail === undefined
+                        ? {}
+                        : {
+                            boundSession: {
+                                sessionRid: fromGeneratedRoutingId(decoded.boundSessionTail.sourceSessionRid, 'sourceSessionRid'),
+                                bindingGeneration: decoded.boundSessionTail.sourceBindingGeneration,
+                                sequence: decoded.boundSessionTail.sourceSessionSequence
+                            }
+                        })
+                };
+            }
+            catch (error) {
+                throw new service_wire_m6a_codec_1.ServiceWireProtocolError(error instanceof Error ? error.message : 'Invalid stateful message.');
+            }
         }
+    }
+    const reader = new Reader(frame);
+    const command = reader.prefix();
+    switch (command.command) {
         case exports.M6bServiceWireCommand.logicalMulticast: {
             requireFlags(command.flags, 0);
             const result = {
@@ -756,33 +880,44 @@ function decodeStatefulHeader(frame) {
             if ((command.flags & ~exports.M6bServiceWireFlag.metadata) !== 0) {
                 fail(`Invalid command flags '${command.flags}'.`);
             }
+            const routeStart = reader.offset;
             const version = reader.u8('instanceRoute.version');
-            if (version !== 1 && version !== 2)
+            if (version !== INSTANCE_ROUTE_VERSION && version !== INSTANCE_ACTIVATION_VERSION)
                 fail('Unsupported Instance route version.');
             const routeLength = reader.u16('instanceRoute.length');
             const routeEnd = reader.offset + routeLength;
-            const commonTarget = {
-                targetNodeRid: reader.rid('targetNodeRid'),
-                targetNodeGeneration: reader.nonZeroU64('targetNodeGeneration'),
-                targetSpotId: reader.rid('targetSpotId')
-            };
-            const route = version === 1
+            const generatedReadyRoute = version === INSTANCE_ROUTE_VERSION
+                ? (0, service_wire_codec_generated_1.decodeInstanceRouteV1)(reader.bytes.subarray(routeStart, routeEnd), STATEFUL_MESSAGE_CONTEXT)
+                : undefined;
+            if (generatedReadyRoute !== undefined && generatedReadyRoute.routeKind !== 'ready') {
+                fail('Invalid Ready Instance route kind.');
+            }
+            const commonTarget = generatedReadyRoute?.routeKind === 'ready'
+                ? {
+                    targetNodeRid: fromGeneratedRoutingId(generatedReadyRoute.targetNodeRid, 'targetNodeRid'),
+                    targetNodeGeneration: generatedReadyRoute.targetNodeGeneration,
+                    targetSpotId: generatedReadyRoute.targetSpotId
+                }
+                : {
+                    targetNodeRid: reader.rid('targetNodeRid'),
+                    targetNodeGeneration: reader.nonZeroU64('targetNodeGeneration'),
+                    targetSpotId: reader.rid('targetSpotId')
+                };
+            const route = generatedReadyRoute?.routeKind === 'ready'
                 ? {
                     ...commonTarget,
-                    objectGeneration: reader.nonZeroU64('objectGeneration'),
-                    ownerId: reader.text8('ownerId'),
-                    authorityOwnerGeneration: reader.nonZeroU64('authorityOwnerGeneration'),
-                    leaseGeneration: reader.nonZeroU64('leaseGeneration'),
-                    storeVersion: reader.text16('storeVersion')
+                    ...generatedReadyRoute.authority
                 }
                 : undefined;
-            const target = version === 2
+            const target = version === INSTANCE_ACTIVATION_VERSION
                 ? {
                     ...commonTarget,
                     stableType: reader.text16('stableType'),
                     descriptorVersion: reader.text16('descriptorVersion')
                 }
                 : undefined;
+            if (generatedReadyRoute !== undefined)
+                reader.offset = routeEnd;
             if (reader.offset !== routeEnd)
                 fail('Invalid Instance route body length.');
             const sourceNodeGeneration = reader.nonZeroU64('sourceNodeGeneration');
@@ -796,15 +931,17 @@ function decodeStatefulHeader(frame) {
                 low: reader.u64('operation.low')
             };
             const operationKind = operationValue === 1 ? 'send' : 'request';
-            if (version === 1 &&
+            if (version === INSTANCE_ROUTE_VERSION &&
                 ((operationKind === 'send' && (operation.high !== 0n || operation.low !== 0n)) ||
                     (operationKind === 'request' && operation.high === 0n && operation.low === 0n))) {
                 fail('Invalid Instance operation identity.');
             }
-            if (version === 2 && operation.high === 0n && operation.low === 0n) {
+            if (version === INSTANCE_ACTIVATION_VERSION &&
+                operation.high === 0n &&
+                operation.low === 0n) {
                 fail('Instance activation requires a non-zero operation identity.');
             }
-            const deadlineUnixMs = version === 2 ? reader.nonZeroU64('deadlineUnixMs') : undefined;
+            const deadlineUnixMs = version === INSTANCE_ACTIVATION_VERSION ? reader.nonZeroU64('deadlineUnixMs') : undefined;
             const replyRouteId = operationKind === 'request' ? reader.nonZeroU64('replyRouteId') : undefined;
             reader.end();
             const common = {
@@ -816,8 +953,13 @@ function decodeStatefulHeader(frame) {
                 operation,
                 ...(replyRouteId === undefined ? {} : { replyRouteId })
             };
-            return version === 1
-                ? { ...common, activation: 'ready', route: route }
+            return version === INSTANCE_ROUTE_VERSION
+                ? {
+                    ...common,
+                    activation: 'ready',
+                    route: route,
+                    instanceIntent: generatedReadyRoute.instanceIntent === 'true'
+                }
                 : {
                     ...common,
                     activation: 'missing',
@@ -827,12 +969,12 @@ function decodeStatefulHeader(frame) {
         }
         case exports.M6bServiceWireCommand.messageFollow: {
             requireFlags(command.flags, 0);
-            if (reader.u8('messageFollow.version') !== 1) {
+            if (reader.u8('messageFollow.version') !== MESSAGE_FOLLOW_VERSION) {
                 fail('Unsupported Message Follow version.');
             }
             const length = reader.u32('messageFollow.length');
             const end = reader.offset + length;
-            if (length > 16 * 1024 * 1024 || end > reader.bytes.byteLength) {
+            if (length > MESSAGE_FOLLOW_MAX_BODY_BYTES || end > reader.bytes.byteLength) {
                 fail('Invalid Message Follow body length.');
             }
             const record = {
@@ -1006,7 +1148,7 @@ function decodeStatefulReply(frame, expectedCorrelation, operationKind, hasPaylo
                     ? 0
                     : (() => {
                         const value = reader.u32('receiveChunkLimitBytes');
-                        if (value > exports.RELOCATION_STATE_CHUNK_DATA_MAX_BYTES) {
+                        if (value > InternalDefaults_1.RELOCATION_STATE_CHUNK_DATA_MAX_BYTES) {
                             fail('receiveChunkLimitBytes exceeds the relocation state chunk data bound.');
                         }
                         return value;
@@ -1110,7 +1252,7 @@ function encodeReplyTail(tail) {
                 }
                 const receiveChunkLimitBytes = tail.receiveChunkLimitBytes ?? 0;
                 if (receiveChunkLimitBytes < 0 ||
-                    receiveChunkLimitBytes > exports.RELOCATION_STATE_CHUNK_DATA_MAX_BYTES) {
+                    receiveChunkLimitBytes > InternalDefaults_1.RELOCATION_STATE_CHUNK_DATA_MAX_BYTES) {
                     fail('receiveChunkLimitBytes exceeds the relocation state chunk data bound.');
                 }
                 const body = concat(spotRef(tail.spot), u64(tail.membershipEpoch), u32(receiveChunkLimitBytes, 'receiveChunkLimitBytes'));
@@ -1171,7 +1313,7 @@ function validateRelocationPhase(value) {
 }
 function applicationPayload(value) {
     const body = concat(text8(value.packetName, 'packetName'), text8(value.contentType, 'contentType'), u32(value.bytes.byteLength, 'payload.length'), value.bytes);
-    return concat(Buffer.of(1), u32(body.byteLength, 'applicationPayload.length'), body);
+    return concat(Buffer.of(service_wire_m6a_codec_1.APPLICATION_PAYLOAD_VERSION), u32(body.byteLength, 'applicationPayload.length'), body);
 }
 function prefix(command, flags = 0) {
     return Buffer.from([MAGIC_0, MAGIC_1, MAJOR, command, flags]);
@@ -1182,12 +1324,6 @@ function actorFence(value) {
 function actorAuthorityFence(value) {
     return concat(actorRef(value.actor), rid(value.actor.nodeRid, 'targetNodeRid'), u64(value.targetNodeGeneration), u64(value.authorityOwnerGeneration), u64(value.ownerLeaseGeneration));
 }
-function spotFence(value) {
-    return concat(spotRef(value.spot), rid(value.targetNodeRid, 'targetNodeRid'), u64(value.targetNodeGeneration), u64(value.authorityOwnerGeneration), u64(value.ownerLeaseGeneration));
-}
-function directSpotFence(value) {
-    return concat(spotFence(value), text16(value.storeVersion, 'storeVersion'));
-}
 function messageFollowRoute(value) {
     const body = value.kind === 'actor'
         ? concat(actorRef(value.actor), rid(value.targetNodeRid, 'targetNodeRid'), u64(value.targetNodeGeneration), u64(value.authorityOwnerGeneration), u64(value.ownerLeaseGeneration))
@@ -1225,18 +1361,13 @@ function validateMessageFollowRecord(value, invalid = (message) => {
     if (value.originalOperation.high === 0n && value.originalOperation.low === 0n) {
         invalid('Message Follow originalOperation must not be zero.');
     }
-    if (value.originalReplyRouteId < 0n || value.originalReplyRouteId > 0xffffffffffffffffn) {
+    if (value.originalReplyRouteId < 0n || value.originalReplyRouteId > stream_wire_1.UINT64_MAX) {
         invalid('Message Follow originalReplyRouteId must be a u64.');
     }
 }
 function actorRef(value) {
     return concat(text8(value.actorId, 'actorId'), u64(value.generation));
 }
-function optionalActor(value) {
-    return value === undefined
-        ? Buffer.of(0)
-        : concat(text8(value.actorId, 'sourceActorId'), u64(value.generation));
-}
 function spotRef(value) {
     return concat(rid(value.spotId, 'spotId'), u64(value.generation));
 }
@@ -1280,7 +1411,7 @@ function u64(value) {
     return result;
 }
 function u64Any(value) {
-    if (value < 0n || value > 0xffffffffffffffffn) {
+    if (value < 0n || value > stream_wire_1.UINT64_MAX) {
         throw new RangeError('u64 value is out of range.');
     }
     const result = Buffer.alloc(8);
@@ -1288,7 +1419,7 @@ function u64Any(value) {
     return result;
 }
 function requirePositive(value, name) {
-    if (value === undefined || value < 1n || value > 0xffffffffffffffffn) {
+    if (value === undefined || value < 1n || value > stream_wire_1.UINT64_MAX) {
         throw new RangeError(`${name} must be a non-zero u64.`);
     }
     return value;
@@ -1408,20 +1539,6 @@ class Reader {
             generation: this.nonZeroU64(`${name}.generation`)
         };
     }
-    optionalActor() {
-        const length = this.u8('sourceActorId.length');
-        if (length === 0)
-            return undefined;
-        this.need(length, 'sourceActorId');
-        const bytes = this.bytes.subarray(this.offset, this.offset + length);
-        this.offset += length;
-        const actorId = (0, service_wire_binary_primitives_1.decodeCanonicalServiceWireText)(bytes, 'sourceActorId', fail);
-        return {
-            nodeRid: '',
-            actorId,
-            generation: this.nonZeroU64('sourceActorGeneration')
-        };
-    }
     spotRef() {
         return {
             spotId: this.rid('spotId'),
@@ -1438,22 +1555,6 @@ class Reader {
             ownerLeaseGeneration: this.nonZeroU64('ownerLeaseGeneration')
         };
     }
-    spotFence() {
-        const spot = this.spotRef();
-        return {
-            spot,
-            targetNodeRid: this.rid('targetNodeRid'),
-            targetNodeGeneration: this.nonZeroU64('targetNodeGeneration'),
-            authorityOwnerGeneration: this.nonZeroU64('authorityOwnerGeneration'),
-            ownerLeaseGeneration: this.nonZeroU64('ownerLeaseGeneration')
-        };
-    }
-    directSpotFence() {
-        return {
-            ...this.spotFence(),
-            storeVersion: this.text16('storeVersion')
-        };
-    }
     messageFollowRoute(name) {
         const kind = this.u8(`${name}.objectKind`);
         const length = this.u16(`${name}.length`);
@@ -1765,7 +1866,7 @@ class FrozenReader {
         return new FrozenReader(body);
     }
     applicationPayload() {
-        if (this.u8('applicationPayload.version') !== 1) {
+        if (this.u8('applicationPayload.version') !== service_wire_m6a_codec_1.APPLICATION_PAYLOAD_VERSION) {
             fail('Application payload envelope version must be one.');
         }
         const body = this.body32('application payload');
@@ -1929,26 +2030,22 @@ class FrozenReader {
         body.end('send-ready destination');
     }
     instanceRoute() {
+        const start = this.offset;
         const kind = this.u8('instanceRouteKind');
         if (kind < 1 || kind > 2)
             fail('Invalid Instance route kind.');
         const body = this.body16('Instance route');
+        if (kind === INSTANCE_ROUTE_VERSION) {
+            (0, service_wire_codec_generated_1.decodeInstanceRouteV1)(this.bytes.subarray(start, this.offset), STATEFUL_MESSAGE_CONTEXT);
+            return;
+        }
         body.rid8('targetNodeRid');
         body.nonZeroU64('targetNodeGeneration');
         body.text8('targetSpotId');
-        if (kind === 1) {
-            body.nonZeroU64('objectGeneration');
-            body.text8('ownerId');
-            body.nonZeroU64('authorityOwnerGeneration');
-            body.nonZeroU64('leaseGeneration');
-            body.text16('storeVersion');
-        }
-        else {
-            body.text8('targetMeshName');
-            body.text8('stableType');
-            body.text8('targetDescriptorVersion');
-            body.nonZeroU64('deadlineUnixMs');
-        }
+        body.text8('targetMeshName');
+        body.text8('stableType');
+        body.text8('targetDescriptorVersion');
+        body.nonZeroU64('deadlineUnixMs');
         body.end('Instance route');
     }
     relocationObject() {

package/dist/runtime/foundation/service-topology-registry.d.ts

@@ -26,7 +26,6 @@ export interface ServiceNodeDescriptor {
 export interface AdmittedServicePeer {
     readonly descriptor: ServiceNodeDescriptor;
     readonly connectionId: string;
-    readonly connectionDiscriminator: string;
 }
 export interface ServicePeerAdmissionExpectation {
     readonly endpoint?: string;
@@ -45,14 +44,13 @@ export declare class ServiceTopologyRegistry {
     constructor(local: ServiceNodeDescriptor);
     localDescriptor(): ServiceNodeDescriptor;
     publishLocal(descriptor: ServiceNodeDescriptor): void;
-    admit(descriptor: ServiceNodeDescriptor, connectionId: string, expected?: ServicePeerAdmissionExpectation, connectionDiscriminator?: string): PeerAdmissionResult;
+    admit(descriptor: ServiceNodeDescriptor, connectionId: string, expected?: ServicePeerAdmissionExpectation): PeerAdmissionResult;
     disconnect(nodeRoutingId: string, connectionId: string): boolean;
     peer(nodeRoutingId: string): AdmittedServicePeer | undefined;
     peers(): readonly AdmittedServicePeer[];
     private peersCore;
     notRequiredPeers(): readonly ServiceNodeDescriptor[];
     replaceDiscoveredNotRequired(descriptors: readonly ServiceNodeDescriptor[]): void;
-    markNotRequired(descriptor: ServiceNodeDescriptor): void;
     forgetNotRequired(nodeRoutingId: string): void;
     knownDescriptor(nodeRoutingId: string): ServiceNodeDescriptor | undefined;
     hasKnownChannelTarget(channelName: string): boolean;