@naylence/runtime 0.3.5-test.961 → 0.3.5-test.963

package/dist/esm/naylence/fame/connector/broadcast-channel-connector.browser.js

@@ -46,6 +46,26 @@ export class BroadcastChannelConnector extends BaseAsyncConnector {
         }
         return null;
     }
+    static normalizeNodeId(value) {
+        if (typeof value !== 'string') {
+            return null;
+        }
+        const trimmed = value.trim();
+        return trimmed.length > 0 ? trimmed : null;
+    }
+    static normalizeTargetNodeId(value) {
+        if (typeof value !== 'string') {
+            return undefined;
+        }
+        const trimmed = value.trim();
+        if (trimmed.length === 0) {
+            return undefined;
+        }
+        if (trimmed === '*') {
+            return '*';
+        }
+        return trimmed;
+    }
     constructor(config, baseConfig = {}) {
         ensureBroadcastEnvironment();
         super(baseConfig);
@@ -68,10 +88,18 @@ export class BroadcastChannelConnector extends BaseAsyncConnector {
         this.inbox = new BoundedAsyncQueue(preferredCapacity);
         this.inboxCapacity = preferredCapacity;
         this.connectorId = BroadcastChannelConnector.generateConnectorId();
+        const normalizedLocalNodeId = BroadcastChannelConnector.normalizeNodeId(config.localNodeId);
+        if (!normalizedLocalNodeId) {
+            throw new Error('BroadcastChannelConnector requires a non-empty localNodeId');
+        }
+        this.localNodeId = normalizedLocalNodeId;
+        this.targetNodeId = BroadcastChannelConnector.normalizeTargetNodeId(config.initialTargetNodeId);
         this.channel = new BroadcastChannel(this.channelName);
         logger.debug('broadcast_channel_connector_created', {
             channel: this.channelName,
             connector_id: this.connectorId,
+            local_node_id: this.localNodeId,
+            target_node_id: this.targetNodeId ?? null,
             inbox_capacity: preferredCapacity,
             timestamp: new Date().toISOString(),
         });
@@ -93,15 +121,32 @@ export class BroadcastChannelConnector extends BaseAsyncConnector {
                     ? message.constructor?.name ?? typeof message
                     : typeof message,
                 has_sender_id: Boolean(message?.senderId),
+                has_sender_node_id: Boolean(message?.senderNodeId),
             });
             if (!message || typeof message !== 'object') {
                 return;
             }
             const busMessage = message;
-            if (typeof busMessage.senderId !== 'string' || busMessage.senderId.length === 0) {
+            const senderNodeId = BroadcastChannelConnector.normalizeNodeId(busMessage.senderNodeId);
+            if (!senderNodeId) {
+                logger.debug('broadcast_channel_message_rejected', {
+                    channel: this.channelName,
+                    connector_id: this.connectorId,
+                    reason: 'missing_sender_node_id',
+                });
+                return;
+            }
+            if (senderNodeId === this.localNodeId) {
+                logger.debug('broadcast_channel_message_rejected', {
+                    channel: this.channelName,
+                    connector_id: this.connectorId,
+                    reason: 'self_echo',
+                    sender_node_id: senderNodeId,
+                });
                 return;
             }
-            if (busMessage.senderId === this.connectorId) {
+            const incomingTargetNodeId = BroadcastChannelConnector.normalizeTargetNodeId(busMessage.targetNodeId);
+            if (!this._shouldAcceptMessageFromBus(senderNodeId, incomingTargetNodeId)) {
                 return;
             }
             const payload = BroadcastChannelConnector.coercePayload(busMessage.payload);
@@ -115,11 +160,13 @@ export class BroadcastChannelConnector extends BaseAsyncConnector {
             }
             logger.debug('broadcast_channel_message_received', {
                 channel: this.channelName,
-                sender_id: busMessage.senderId,
+                sender_id: message?.senderId,
+                sender_node_id: senderNodeId,
+                target_node_id: incomingTargetNodeId ?? null,
                 connector_id: this.connectorId,
                 payload_length: payload.byteLength,
             });
-            if (this._shouldSkipDuplicateAck(busMessage.senderId, payload)) {
+            if (this._shouldSkipDuplicateAck(senderNodeId, payload)) {
                 return;
             }
             try {
@@ -263,12 +310,17 @@ export class BroadcastChannelConnector extends BaseAsyncConnector {
     }
     async _transportSendBytes(data) {
         ensureBroadcastEnvironment();
+        const targetNodeId = this.targetNodeId ?? '*';
         logger.debug('broadcast_channel_message_sending', {
             channel: this.channelName,
             sender_id: this.connectorId,
+            sender_node_id: this.localNodeId,
+            target_node_id: targetNodeId,
         });
         this.channel.postMessage({
             senderId: this.connectorId,
+            senderNodeId: this.localNodeId,
+            targetNodeId,
             payload: data,
         });
     }
@@ -331,6 +383,51 @@ export class BroadcastChannelConnector extends BaseAsyncConnector {
         }
         return rawOrEnvelope;
     }
+    _isWildcardTarget() {
+        return this.targetNodeId === '*' || typeof this.targetNodeId === 'undefined';
+    }
+    _shouldAcceptMessageFromBus(senderNodeId, targetNodeId) {
+        if (this._isWildcardTarget()) {
+            if (targetNodeId && targetNodeId !== '*') {
+                logger.debug('broadcast_channel_message_rejected', {
+                    channel: this.channelName,
+                    connector_id: this.connectorId,
+                    reason: 'wildcard_target_mismatch',
+                    sender_node_id: senderNodeId,
+                    target_node_id: targetNodeId,
+                    local_node_id: this.localNodeId,
+                });
+                return false;
+            }
+            return true;
+        }
+        const expectedSender = this.targetNodeId;
+        if (expectedSender && expectedSender !== '*' && senderNodeId !== expectedSender) {
+            logger.debug('broadcast_channel_message_rejected', {
+                channel: this.channelName,
+                connector_id: this.connectorId,
+                reason: 'unexpected_sender',
+                expected_sender_node_id: expectedSender,
+                sender_node_id: senderNodeId,
+                local_node_id: this.localNodeId,
+            });
+            return false;
+        }
+        if (targetNodeId &&
+            targetNodeId !== '*' &&
+            targetNodeId !== this.localNodeId) {
+            logger.debug('broadcast_channel_message_rejected', {
+                channel: this.channelName,
+                connector_id: this.connectorId,
+                reason: 'unexpected_target',
+                sender_node_id: senderNodeId,
+                target_node_id: targetNodeId,
+                local_node_id: this.localNodeId,
+            });
+            return false;
+        }
+        return true;
+    }
     _describeInboxItem(item) {
         if (item instanceof Uint8Array) {
             return 'bytes';
@@ -361,7 +458,7 @@ export class BroadcastChannelConnector extends BaseAsyncConnector {
         const normalizedSenderId = typeof senderId === 'string' && senderId.length > 0
             ? senderId
             : undefined;
-        if (normalizedSenderId && normalizedSenderId !== this.connectorId) {
+        if (normalizedSenderId && normalizedSenderId !== this.localNodeId) {
             logger.debug('broadcast_channel_duplicate_ack_bypass_non_self', {
                 channel: this.channelName,
                 connector_id: this.connectorId,
@@ -401,7 +498,7 @@ export class BroadcastChannelConnector extends BaseAsyncConnector {
             return false;
         }
         const senderId = this._extractSenderIdFromInboxItem(item);
-        if (senderId && senderId !== this.connectorId) {
+        if (senderId && senderId !== this.localNodeId) {
             logger.debug('broadcast_channel_duplicate_ack_bypass_non_self', {
                 channel: this.channelName,
                 connector_id: this.connectorId,
@@ -497,6 +594,34 @@ export class BroadcastChannelConnector extends BaseAsyncConnector {
             });
         }
     }
+    setTargetNodeId(nodeId) {
+        const normalized = BroadcastChannelConnector.normalizeNodeId(nodeId);
+        if (!normalized) {
+            throw new Error('BroadcastChannelConnector target node id must be a non-empty string');
+        }
+        if (normalized === '*') {
+            this.setWildcardTarget();
+            return;
+        }
+        this.targetNodeId = normalized;
+        logger.debug('broadcast_channel_target_updated', {
+            channel: this.channelName,
+            connector_id: this.connectorId,
+            local_node_id: this.localNodeId,
+            target_node_id: this.targetNodeId,
+            target_mode: 'direct',
+        });
+    }
+    setWildcardTarget() {
+        this.targetNodeId = '*';
+        logger.debug('broadcast_channel_target_updated', {
+            channel: this.channelName,
+            connector_id: this.connectorId,
+            local_node_id: this.localNodeId,
+            target_node_id: this.targetNodeId,
+            target_mode: 'wildcard',
+        });
+    }
     _trimSeenAcks(now) {
         while (this.seenAckOrder.length > 0) {
             const candidate = this.seenAckOrder[0];

package/dist/esm/naylence/fame/connector/broadcast-channel-listener.js

@@ -324,7 +324,7 @@ export class BroadcastChannelListener extends TransportListener {
                 node: routingNode,
             });
             const selection = defaultGrantSelectionPolicy.selectCallbackGrant(selectionContext);
-            connectorConfig = this._grantToConnectorConfig(selection.grant);
+            connectorConfig = this._grantToConnectorConfig(selection.grant, systemId);
         }
         catch (error) {
             logger.debug('broadcast_channel_listener_grant_selection_failed', {
@@ -333,13 +333,20 @@ export class BroadcastChannelListener extends TransportListener {
                 error: error instanceof Error ? error.message : String(error),
             });
             connectorConfig =
-                this._extractBroadcastConnectorConfig(frame) ??
-                    {
+                this._extractBroadcastConnectorConfig(frame, systemId) ??
+                    this._buildConnectorConfigForSystem(systemId, {
                         type: BROADCAST_CHANNEL_CONNECTOR_TYPE,
                         channelName: this._channelName,
                         inboxCapacity: this._inboxCapacity,
                         passive: true,
-                    };
+                    });
+        }
+        if (!connectorConfig) {
+            logger.error('broadcast_channel_listener_missing_connector_config', {
+                sender_id: params.senderId,
+                system_id: systemId,
+            });
+            return null;
         }
         try {
             const connector = await routingNode.createOriginConnector({
@@ -365,7 +372,7 @@ export class BroadcastChannelListener extends TransportListener {
             return null;
         }
     }
-    _extractBroadcastConnectorConfig(frame) {
+    _extractBroadcastConnectorConfig(frame, systemId) {
         const rawGrants = frame.callbackGrants;
         if (!Array.isArray(rawGrants)) {
             return null;
@@ -376,7 +383,10 @@ export class BroadcastChannelListener extends TransportListener {
                 (grant.type === BROADCAST_CHANNEL_CONNECTION_GRANT_TYPE ||
                     grant.type === BROADCAST_CHANNEL_CONNECTOR_TYPE)) {
                 try {
-                    return this._grantToConnectorConfig(grant);
+                    if (grant.type === BROADCAST_CHANNEL_CONNECTOR_TYPE) {
+                        return this._buildConnectorConfigForSystem(systemId, grant);
+                    }
+                    return this._buildConnectorConfigForSystem(systemId, broadcastChannelGrantToConnectorConfig(grant));
                 }
                 catch (error) {
                     logger.debug('broadcast_channel_listener_grant_normalization_failed', {
@@ -387,31 +397,87 @@ export class BroadcastChannelListener extends TransportListener {
         }
         return null;
     }
-    _grantToConnectorConfig(grant) {
-        if (grant.type !== BROADCAST_CHANNEL_CONNECTOR_TYPE) {
-            if (grant.type === BROADCAST_CHANNEL_CONNECTION_GRANT_TYPE) {
-                return broadcastChannelGrantToConnectorConfig(grant);
+    _grantToConnectorConfig(grant, systemId) {
+        if (grant.type === BROADCAST_CHANNEL_CONNECTOR_TYPE) {
+            return this._buildConnectorConfigForSystem(systemId, grant);
+        }
+        if (grant.type === BROADCAST_CHANNEL_CONNECTION_GRANT_TYPE) {
+            return this._buildConnectorConfigForSystem(systemId, broadcastChannelGrantToConnectorConfig(grant));
+        }
+        if ('toConnectorConfig' in grant &&
+            typeof grant.toConnectorConfig ===
+                'function') {
+            const normalized = grant.toConnectorConfig();
+            if (normalized.type !== BROADCAST_CHANNEL_CONNECTOR_TYPE) {
+                throw new Error(`Unsupported grant connector type: ${normalized.type}`);
             }
-            throw new Error(`Unsupported grant type: ${grant.type}`);
+            return this._buildConnectorConfigForSystem(systemId, normalized);
         }
-        const candidate = grant;
-        const config = {
+        throw new Error(`Unsupported grant type: ${grant.type}`);
+    }
+    _buildConnectorConfigForSystem(systemId, baseConfig) {
+        const localNodeId = this._requireLocalNodeId();
+        const targetSystemId = this._normalizeNodeId(systemId);
+        if (!targetSystemId) {
+            throw new Error('BroadcastChannelListener requires a valid system id');
+        }
+        const candidate = baseConfig ?? null;
+        const channelCandidate = candidate && 'channelName' in candidate
+            ? candidate.channelName
+            : undefined;
+        const inboxCandidate = candidate && 'inboxCapacity' in candidate
+            ? candidate.inboxCapacity
+            : undefined;
+        const initialWindowCandidate = candidate && 'initialWindow' in candidate
+            ? candidate.initialWindow
+            : undefined;
+        const passiveCandidate = candidate && 'passive' in candidate
+            ? candidate.passive
+            : undefined;
+        const targetCandidate = candidate && 'initialTargetNodeId' in candidate
+            ? candidate.initialTargetNodeId
+            : undefined;
+        const channelName = typeof channelCandidate === 'string' && channelCandidate.trim().length > 0
+            ? channelCandidate.trim()
+            : this._channelName;
+        const inboxCapacity = typeof inboxCandidate === 'number' &&
+            Number.isFinite(inboxCandidate) &&
+            inboxCandidate > 0
+            ? Math.floor(inboxCandidate)
+            : this._inboxCapacity;
+        const initialWindow = typeof initialWindowCandidate === 'number' &&
+            Number.isFinite(initialWindowCandidate) &&
+            initialWindowCandidate > 0
+            ? Math.floor(initialWindowCandidate)
+            : undefined;
+        const initialTargetNodeId = this._normalizeNodeId(targetCandidate) ?? targetSystemId;
+        return {
             type: BROADCAST_CHANNEL_CONNECTOR_TYPE,
-            channelName: this._channelName,
-            inboxCapacity: this._inboxCapacity,
-            passive: true,
+            channelName,
+            inboxCapacity,
+            passive: typeof passiveCandidate === 'boolean' ? passiveCandidate : true,
+            initialWindow,
+            localNodeId,
+            initialTargetNodeId,
         };
-        const channelCandidate = candidate.channelName ?? candidate['channel_name'];
-        if (typeof channelCandidate === 'string' && channelCandidate.trim().length > 0) {
-            config.channelName = channelCandidate.trim();
+    }
+    _requireLocalNodeId() {
+        if (!this._routingNode) {
+            throw new Error('BroadcastChannelListener requires routing node context');
         }
-        const inboxCandidate = candidate.inboxCapacity ?? candidate['inbox_capacity'];
-        if (typeof inboxCandidate === 'number' &&
-            Number.isFinite(inboxCandidate) &&
-            inboxCandidate > 0) {
-            config.inboxCapacity = Math.floor(inboxCandidate);
+        const normalized = this._normalizeNodeId(this._routingNode.sid) ??
+            this._normalizeNodeId(this._routingNode.id);
+        if (!normalized) {
+            throw new Error('BroadcastChannelListener requires routing node with a stable identifier');
+        }
+        return normalized;
+    }
+    _normalizeNodeId(value) {
+        if (typeof value !== 'string') {
+            return null;
         }
-        return config;
+        const trimmed = value.trim();
+        return trimmed.length > 0 ? trimmed : null;
     }
     _monitorConnectorLifecycle(senderId, systemId, connector) {
         const maybeClosable = connector;

package/dist/esm/naylence/fame/node/upstream-session-manager.js

@@ -277,6 +277,20 @@ export class UpstreamSessionManager extends TaskSpawner {
     waitEvent(event, signal) {
         return signal ? event.wait({ signal }) : event.wait();
     }
+    _getLocalNodeId() {
+        const normalized = this._normalizeNodeId(this.node.id);
+        if (!normalized) {
+            throw new Error('UpstreamSessionManager requires node with a stable identifier');
+        }
+        return normalized;
+    }
+    _normalizeNodeId(value) {
+        if (typeof value !== 'string') {
+            return null;
+        }
+        const trimmed = value.trim();
+        return trimmed.length > 0 ? trimmed : null;
+    }
     async connectCycle() {
         if (!this.admissionClient) {
             throw new FameConnectError('Admission client is required to attach upstream');
@@ -298,6 +312,8 @@ export class UpstreamSessionManager extends TaskSpawner {
         await this.onWelcome(welcome.frame);
         const connector = await ConnectorFactory.createConnector(grant, {
             systemId: welcome.frame.systemId,
+            localNodeId: this._getLocalNodeId(),
+            initialTargetNodeId: '*',
         });
         await connector.start(this.wrappedHandler);
         this.connector = connector;
@@ -323,6 +339,20 @@ export class UpstreamSessionManager extends TaskSpawner {
         }
         const attachInfo = await this.attachClient.attach(this.node, this.outboundOriginType, connector, welcome.frame, this.wrappedHandler, this.getKeys() ?? undefined, callbackGrants);
         this.targetSystemId = attachInfo.targetSystemId ?? null;
+        if (this.targetSystemId) {
+            const targetAware = connector;
+            if (typeof targetAware.setTargetNodeId === 'function') {
+                try {
+                    targetAware.setTargetNodeId(this.targetSystemId);
+                }
+                catch (error) {
+                    logger.warning('broadcast_channel_target_apply_failed', {
+                        error: error instanceof Error ? error.message : String(error),
+                        target_node_id: this.targetSystemId,
+                    });
+                }
+            }
+        }
         await this.onAttach(attachInfo, connector);
         // Close the admission client immediately after attach completes
         // This releases HTTP keep-alive connections (Node.js fetch/undici requires explicit cleanup)

package/dist/esm/version.js

@@ -1,7 +1,7 @@
 // This file is auto-generated during build - do not edit manually
-// Generated from package.json version: 0.3.5-test.961
+// Generated from package.json version: 0.3.5-test.963
 /**
  * The package version, injected at build time.
  * @internal
  */
-export const VERSION = '0.3.5-test.961';
+export const VERSION = '0.3.5-test.963';