@naylence/runtime 0.3.5-test.942 → 0.3.5-test.944

package/dist/node/index.cjs

@@ -14,12 +14,12 @@ var fastify = require('fastify');
 var websocketPlugin = require('@fastify/websocket');
 
 // This file is auto-generated during build - do not edit manually
-// Generated from package.json version: 0.3.5-test.942
+// Generated from package.json version: 0.3.5-test.944
 /**
  * The package version, injected at build time.
  * @internal
  */
-const VERSION = '0.3.5-test.942';
+const VERSION = '0.3.5-test.944';
 
 /**
  * Fame protocol specific error classes with WebSocket close codes and proper inheritance.
@@ -9734,6 +9734,85 @@ class BoundedAsyncQueue {
     }
 }
 
+/**
+ * Transport frame layer for multiplexing logical links on physical channels.
+ *
+ * This lightweight framing layer wraps raw FAME payloads to enable multiple
+ * logical connections over a single physical channel (BroadcastChannel or InPage bus).
+ *
+ * The transport frame does NOT modify FAME envelopes - it only wraps the raw
+ * Uint8Array payload at the connector level.
+ */
+/**
+ * Transport frame version for future compatibility
+ */
+const TRANSPORT_FRAME_VERSION = 1;
+/**
+ * Wrap a raw payload in a transport frame
+ *
+ * @param payload - Raw FAME envelope bytes
+ * @param srcNodeId - Local node ID (this connector)
+ * @param dstNodeId - Remote node ID (target connector)
+ * @returns Transport frame ready for transmission
+ */
+function wrapTransportFrame(payload, srcNodeId, dstNodeId) {
+    return {
+        v: TRANSPORT_FRAME_VERSION,
+        src: srcNodeId,
+        dst: dstNodeId,
+        payload,
+    };
+}
+/**
+ * Serialize a transport frame for transmission over the bus
+ *
+ * @param frame - Transport frame to serialize
+ * @returns Serialized frame data ready for postMessage/dispatchEvent
+ */
+function serializeTransportFrame(frame) {
+    // Convert Uint8Array to regular array for JSON serialization
+    const serializable = {
+        v: frame.v,
+        src: frame.src,
+        dst: frame.dst,
+        payload: Array.from(frame.payload),
+    };
+    return serializable;
+}
+/**
+ * Unwrap a transport frame, validating source and destination
+ *
+ * @param raw - Raw data from the bus
+ * @param localNodeId - This connector's node ID
+ * @param remoteNodeId - Expected remote node ID
+ * @returns Unwrapped payload if frame is valid and addressed to us, null otherwise
+ */
+function unwrapTransportFrame(raw, localNodeId, remoteNodeId) {
+    // Validate basic structure
+    if (!raw || typeof raw !== 'object') {
+        return null;
+    }
+    const frame = raw;
+    // Check version
+    if (frame.v !== TRANSPORT_FRAME_VERSION) {
+        return null;
+    }
+    // Check src and dst
+    if (typeof frame.src !== 'string' || typeof frame.dst !== 'string') {
+        return null;
+    }
+    // Only accept frames addressed to us from the expected remote
+    if (frame.dst !== localNodeId || frame.src !== remoteNodeId) {
+        return null;
+    }
+    // Extract payload
+    if (!frame.payload || !Array.isArray(frame.payload)) {
+        return null;
+    }
+    // Convert array back to Uint8Array
+    return Uint8Array.from(frame.payload);
+}
+
 const logger$_ = getLogger('naylence.fame.connector.broadcast_channel_connector');
 const BROADCAST_CHANNEL_CONNECTOR_TYPE = 'broadcast-channel-connector';
 const DEFAULT_CHANNEL$7 = 'naylence-fabric';
@@ -9799,9 +9878,20 @@ let BroadcastChannelConnector$2 = class BroadcastChannelConnector extends BaseAs
         this.inbox = new BoundedAsyncQueue(preferredCapacity);
         this.connectorId = BroadcastChannelConnector.generateConnectorId();
         this.channel = new BroadcastChannel(this.channelName);
+        // Set local and remote node IDs (defaults to connector ID for backwards compatibility)
+        this.localNodeId =
+            typeof config.localNodeId === 'string' && config.localNodeId.trim().length > 0
+                ? config.localNodeId.trim()
+                : this.connectorId;
+        this.remoteNodeId =
+            typeof config.remoteNodeId === 'string' && config.remoteNodeId.trim().length > 0
+                ? config.remoteNodeId.trim()
+                : '*'; // Accept from any remote if not specified
         logger$_.debug('broadcast_channel_connector_created', {
             channel: this.channelName,
             connector_id: this.connectorId,
+            local_node_id: this.localNodeId,
+            remote_node_id: this.remoteNodeId,
             inbox_capacity: preferredCapacity,
             timestamp: new Date().toISOString(),
         });
@@ -9834,6 +9924,46 @@ let BroadcastChannelConnector$2 = class BroadcastChannelConnector extends BaseAs
             if (busMessage.senderId === this.connectorId) {
                 return;
             }
+            // Try to unwrap as transport frame
+            const unwrapped = unwrapTransportFrame(busMessage.payload, this.localNodeId, this.remoteNodeId === '*' ? busMessage.senderId : this.remoteNodeId);
+            if (unwrapped) {
+                // Successfully unwrapped transport frame
+                logger$_.debug('broadcast_channel_transport_frame_received', {
+                    channel: this.channelName,
+                    sender_id: busMessage.senderId,
+                    connector_id: this.connectorId,
+                    local_node_id: this.localNodeId,
+                    remote_node_id: this.remoteNodeId,
+                    payload_length: unwrapped.byteLength,
+                });
+                if (this._shouldSkipDuplicateAck(busMessage.senderId, unwrapped)) {
+                    return;
+                }
+                try {
+                    if (typeof this.inbox.tryEnqueue === 'function') {
+                        const accepted = this.inbox.tryEnqueue(unwrapped);
+                        if (accepted) {
+                            return;
+                        }
+                    }
+                    this.inbox.enqueue(unwrapped);
+                }
+                catch (error) {
+                    if (error instanceof QueueFullError) {
+                        logger$_.warning('broadcast_channel_receive_queue_full', {
+                            channel: this.channelName,
+                        });
+                    }
+                    else {
+                        logger$_.error('broadcast_channel_receive_error', {
+                            channel: this.channelName,
+                            error: error instanceof Error ? error.message : String(error),
+                        });
+                    }
+                }
+                return;
+            }
+            // Fall back to legacy format (no transport frame)
             const payload = BroadcastChannelConnector.coercePayload(busMessage.payload);
             if (!payload) {
                 logger$_.debug('broadcast_channel_payload_rejected', {
@@ -9972,10 +10102,26 @@ let BroadcastChannelConnector$2 = class BroadcastChannelConnector extends BaseAs
         logger$_.debug('broadcast_channel_message_sending', {
             channel: this.channelName,
             sender_id: this.connectorId,
-        });
+            local_node_id: this.localNodeId,
+            remote_node_id: this.remoteNodeId,
+        });
+        // Only use transport framing if both localNodeId and remoteNodeId are explicitly set
+        // (not using default values). This ensures backwards compatibility.
+        const useTransportFrame = this.localNodeId !== this.connectorId ||
+            this.remoteNodeId !== '*';
+        let payload;
+        if (useTransportFrame) {
+            // Wrap payload in transport frame
+            const frame = wrapTransportFrame(data, this.localNodeId, this.remoteNodeId);
+            payload = serializeTransportFrame(frame);
+        }
+        else {
+            // Legacy format: send raw payload
+            payload = data;
+        }
         this.channel.postMessage({
             senderId: this.connectorId,
-            payload: data,
+            payload,
         });
     }
     async _transportReceive() {
@@ -10268,6 +10414,14 @@ function isBroadcastChannelConnectionGrant(candidate) {
             record.inboxCapacity <= 0)) {
         return false;
     }
+    if (record.localNodeId !== undefined &&
+        (typeof record.localNodeId !== 'string' || record.localNodeId.length === 0)) {
+        return false;
+    }
+    if (record.remoteNodeId !== undefined &&
+        (typeof record.remoteNodeId !== 'string' || record.remoteNodeId.length === 0)) {
+        return false;
+    }
     return true;
 }
 function normalizeBroadcastChannelConnectionGrant(candidate) {
@@ -10301,6 +10455,20 @@ function normalizeBroadcastChannelConnectionGrant(candidate) {
         }
         result.inboxCapacity = Math.floor(inboxValue);
     }
+    const localNodeIdValue = candidate.localNodeId ?? candidate['local_node_id'];
+    if (localNodeIdValue !== undefined) {
+        if (typeof localNodeIdValue !== 'string' || localNodeIdValue.trim().length === 0) {
+            throw new TypeError('BroadcastChannelConnectionGrant "localNodeId" must be a non-empty string when provided');
+        }
+        result.localNodeId = localNodeIdValue.trim();
+    }
+    const remoteNodeIdValue = candidate.remoteNodeId ?? candidate['remote_node_id'];
+    if (remoteNodeIdValue !== undefined) {
+        if (typeof remoteNodeIdValue !== 'string' || remoteNodeIdValue.trim().length === 0) {
+            throw new TypeError('BroadcastChannelConnectionGrant "remoteNodeId" must be a non-empty string when provided');
+        }
+        result.remoteNodeId = remoteNodeIdValue.trim();
+    }
     return result;
 }
 function broadcastChannelGrantToConnectorConfig(grant) {
@@ -10314,6 +10482,12 @@ function broadcastChannelGrantToConnectorConfig(grant) {
     if (normalized.inboxCapacity !== undefined) {
         config.inboxCapacity = normalized.inboxCapacity;
     }
+    if (normalized.localNodeId) {
+        config.localNodeId = normalized.localNodeId;
+    }
+    if (normalized.remoteNodeId) {
+        config.remoteNodeId = normalized.remoteNodeId;
+    }
     return config;
 }
 
@@ -20260,9 +20434,20 @@ class InPageConnector extends BaseAsyncConnector {
             : DEFAULT_INBOX_CAPACITY$6;
         this.inbox = new BoundedAsyncQueue(preferredCapacity);
         this.connectorId = InPageConnector.generateConnectorId();
+        // Set local and remote node IDs (defaults to connector ID for backwards compatibility)
+        this.localNodeId =
+            typeof config.localNodeId === 'string' && config.localNodeId.trim().length > 0
+                ? config.localNodeId.trim()
+                : this.connectorId;
+        this.remoteNodeId =
+            typeof config.remoteNodeId === 'string' && config.remoteNodeId.trim().length > 0
+                ? config.remoteNodeId.trim()
+                : '*'; // Accept from any remote if not specified
         logger$G.debug('inpage_connector_initialized', {
             channel: this.channelName,
             connector_id: this.connectorId,
+            local_node_id: this.localNodeId,
+            remote_node_id: this.remoteNodeId,
         });
         this.onMsg = (event) => {
             const messageEvent = event;
@@ -20296,6 +20481,43 @@ class InPageConnector extends BaseAsyncConnector {
             if (busMessage.senderId === this.connectorId) {
                 return;
             }
+            // Try to unwrap as transport frame
+            const unwrapped = unwrapTransportFrame(busMessage.payload, this.localNodeId, this.remoteNodeId === '*' ? busMessage.senderId : this.remoteNodeId);
+            if (unwrapped) {
+                // Successfully unwrapped transport frame
+                logger$G.debug('inpage_transport_frame_received', {
+                    channel: this.channelName,
+                    sender_id: busMessage.senderId,
+                    connector_id: this.connectorId,
+                    local_node_id: this.localNodeId,
+                    remote_node_id: this.remoteNodeId,
+                    payload_length: unwrapped.byteLength,
+                });
+                try {
+                    if (typeof this.inbox.tryEnqueue === 'function') {
+                        const accepted = this.inbox.tryEnqueue(unwrapped);
+                        if (accepted) {
+                            return;
+                        }
+                    }
+                    this.inbox.enqueue(unwrapped);
+                }
+                catch (error) {
+                    if (error instanceof QueueFullError) {
+                        logger$G.warning('inpage_receive_queue_full', {
+                            channel: this.channelName,
+                        });
+                    }
+                    else {
+                        logger$G.error('inpage_receive_error', {
+                            channel: this.channelName,
+                            error: error instanceof Error ? error.message : String(error),
+                        });
+                    }
+                }
+                return;
+            }
+            // Fall back to legacy format (no transport frame)
             const payload = InPageConnector.coercePayload(busMessage.payload);
             if (!payload) {
                 logger$G.debug('inpage_payload_rejected', {
@@ -20454,11 +20676,27 @@ class InPageConnector extends BaseAsyncConnector {
         logger$G.debug('inpage_message_sending', {
             channel: this.channelName,
             sender_id: this.connectorId,
-        });
+            local_node_id: this.localNodeId,
+            remote_node_id: this.remoteNodeId,
+        });
+        // Only use transport framing if both localNodeId and remoteNodeId are explicitly set
+        // (not using default values). This ensures backwards compatibility.
+        const useTransportFrame = this.localNodeId !== this.connectorId ||
+            this.remoteNodeId !== '*';
+        let payload;
+        if (useTransportFrame) {
+            // Wrap payload in transport frame
+            const frame = wrapTransportFrame(data, this.localNodeId, this.remoteNodeId);
+            payload = serializeTransportFrame(frame);
+        }
+        else {
+            // Legacy format: send raw payload
+            payload = data;
+        }
         const event = new MessageEvent(this.channelName, {
             data: {
                 senderId: this.connectorId,
-                payload: data,
+                payload,
             },
         });
         getSharedBus$1().dispatchEvent(event);
@@ -27823,6 +28061,14 @@ function isInPageConnectionGrant(candidate) {
             record.inboxCapacity <= 0)) {
         return false;
     }
+    if (record.localNodeId !== undefined &&
+        (typeof record.localNodeId !== 'string' || record.localNodeId.length === 0)) {
+        return false;
+    }
+    if (record.remoteNodeId !== undefined &&
+        (typeof record.remoteNodeId !== 'string' || record.remoteNodeId.length === 0)) {
+        return false;
+    }
     return true;
 }
 function normalizeInPageConnectionGrant(candidate) {
@@ -27856,6 +28102,20 @@ function normalizeInPageConnectionGrant(candidate) {
         }
         result.inboxCapacity = Math.floor(inboxValue);
     }
+    const localNodeIdValue = candidate.localNodeId ?? candidate['local_node_id'];
+    if (localNodeIdValue !== undefined) {
+        if (typeof localNodeIdValue !== 'string' || localNodeIdValue.trim().length === 0) {
+            throw new TypeError('InPageConnectionGrant "localNodeId" must be a non-empty string when provided');
+        }
+        result.localNodeId = localNodeIdValue.trim();
+    }
+    const remoteNodeIdValue = candidate.remoteNodeId ?? candidate['remote_node_id'];
+    if (remoteNodeIdValue !== undefined) {
+        if (typeof remoteNodeIdValue !== 'string' || remoteNodeIdValue.trim().length === 0) {
+            throw new TypeError('InPageConnectionGrant "remoteNodeId" must be a non-empty string when provided');
+        }
+        result.remoteNodeId = remoteNodeIdValue.trim();
+    }
     return result;
 }
 function inPageGrantToConnectorConfig(grant) {
@@ -27869,6 +28129,12 @@ function inPageGrantToConnectorConfig(grant) {
     if (normalized.inboxCapacity !== undefined) {
         config.inboxCapacity = normalized.inboxCapacity;
     }
+    if (normalized.localNodeId) {
+        config.localNodeId = normalized.localNodeId;
+    }
+    if (normalized.remoteNodeId) {
+        config.remoteNodeId = normalized.remoteNodeId;
+    }
     return config;
 }
 
@@ -28495,6 +28761,8 @@ class BroadcastChannelConnectorFactory extends ConnectorFactory {
             type: BROADCAST_CHANNEL_CONNECTOR_TYPE,
             channelName,
             inboxCapacity,
+            localNodeId: normalized.localNodeId,
+            remoteNodeId: normalized.remoteNodeId,
         };
         const connector = new BroadcastChannelConnector(connectorConfig, baseConfig);
         if (options.authorization) {
@@ -28556,6 +28824,16 @@ class BroadcastChannelConnectorFactory extends ConnectorFactory {
         if (candidate.authorizationContext !== undefined) {
             normalized.authorizationContext = candidate.authorizationContext;
         }
+        // Handle localNodeId
+        const localNodeId = candidate.localNodeId ?? candidate['local_node_id'];
+        if (typeof localNodeId === 'string' && localNodeId.trim().length > 0) {
+            normalized.localNodeId = localNodeId.trim();
+        }
+        // Handle remoteNodeId
+        const remoteNodeId = candidate.remoteNodeId ?? candidate['remote_node_id'];
+        if (typeof remoteNodeId === 'string' && remoteNodeId.trim().length > 0) {
+            normalized.remoteNodeId = remoteNodeId.trim();
+        }
         normalized.channelName = normalized.channelName ?? DEFAULT_CHANNEL$5;
         normalized.inboxCapacity =
             normalized.inboxCapacity ?? DEFAULT_INBOX_CAPACITY$5;
@@ -29119,6 +29397,8 @@ class InPageConnectorFactory extends ConnectorFactory {
             type: INPAGE_CONNECTOR_TYPE,
             channelName,
             inboxCapacity,
+            localNodeId: normalized.localNodeId,
+            remoteNodeId: normalized.remoteNodeId,
         };
         const connector = new InPageConnector(connectorConfig, baseConfig);
         if (options.authorization) {
@@ -29187,6 +29467,16 @@ class InPageConnectorFactory extends ConnectorFactory {
         if (candidate.authorizationContext !== undefined) {
             normalized.authorizationContext = candidate.authorizationContext;
         }
+        // Handle localNodeId
+        const localNodeId = candidate.localNodeId ?? candidate['local_node_id'];
+        if (typeof localNodeId === 'string' && localNodeId.trim().length > 0) {
+            normalized.localNodeId = localNodeId.trim();
+        }
+        // Handle remoteNodeId
+        const remoteNodeId = candidate.remoteNodeId ?? candidate['remote_node_id'];
+        if (typeof remoteNodeId === 'string' && remoteNodeId.trim().length > 0) {
+            normalized.remoteNodeId = remoteNodeId.trim();
+        }
         normalized.channelName = normalized.channelName ?? DEFAULT_CHANNEL$3;
         normalized.inboxCapacity =
             normalized.inboxCapacity ?? DEFAULT_INBOX_CAPACITY$3;
@@ -36154,6 +36444,26 @@ class BroadcastChannelListener extends TransportListener {
                         inboxCapacity: this._inboxCapacity,
                     };
         }
+        // Automatically configure transport frame multiplexing:
+        // Set remoteNodeId to the incoming senderId to target responses back to the specific client/agent
+        const broadcastConfig = connectorConfig;
+        if (!broadcastConfig.remoteNodeId) {
+            broadcastConfig.remoteNodeId = params.senderId;
+            logger$a.debug('broadcast_channel_listener_auto_configured_remote_node_id', {
+                sender_id: params.senderId,
+                system_id: systemId,
+                remote_node_id: params.senderId,
+                local_node_id: broadcastConfig.localNodeId ?? '<not set>',
+            });
+        }
+        else {
+            logger$a.debug('broadcast_channel_listener_using_provided_remote_node_id', {
+                sender_id: params.senderId,
+                system_id: systemId,
+                remote_node_id: broadcastConfig.remoteNodeId,
+                local_node_id: broadcastConfig.localNodeId ?? '<not set>',
+            });
+        }
         try {
             const connector = await routingNode.createOriginConnector({
                 originType,
@@ -36223,6 +36533,21 @@ class BroadcastChannelListener extends TransportListener {
             inboxCandidate > 0) {
             config.inboxCapacity = Math.floor(inboxCandidate);
         }
+        // Extract transport frame multiplexing node IDs
+        const localNodeIdCandidate = candidate.localNodeId ?? candidate['local_node_id'];
+        if (typeof localNodeIdCandidate === 'string' && localNodeIdCandidate.trim().length > 0) {
+            config.localNodeId = localNodeIdCandidate.trim();
+            logger$a.debug('broadcast_channel_listener_extracted_local_node_id', {
+                local_node_id: config.localNodeId,
+            });
+        }
+        const remoteNodeIdCandidate = candidate.remoteNodeId ?? candidate['remote_node_id'];
+        if (typeof remoteNodeIdCandidate === 'string' && remoteNodeIdCandidate.trim().length > 0) {
+            config.remoteNodeId = remoteNodeIdCandidate.trim();
+            logger$a.debug('broadcast_channel_listener_extracted_remote_node_id', {
+                remote_node_id: config.remoteNodeId,
+            });
+        }
         return config;
     }
     _monitorConnectorLifecycle(senderId, systemId, connector) {
@@ -36945,6 +37270,7 @@ class InPageListener extends TransportListener {
         this._busHandler = null;
         this._senderRegistry = new Map();
         this._systemToSender = new Map();
+        this._flowIdToSender = new Map();
         this._pendingAttachments = new Map();
         ensureBrowserEnvironment();
         const channelCandidate = options?.channelName;
@@ -37011,6 +37337,7 @@ class InPageListener extends TransportListener {
         this._unregisterBusListener();
         this._senderRegistry.clear();
         this._systemToSender.clear();
+        this._flowIdToSender.clear();
         this._pendingAttachments.clear();
         logger$7.debug('inpage_listener_stopped', {
             channel: this._channelName,
@@ -37064,10 +37391,25 @@ class InPageListener extends TransportListener {
             await this._handleAttachFrame(senderId, envelope);
             return;
         }
-        const entry = this._senderRegistry.get(senderId);
+        // Try to find connector by sender ID first
+        let entry = this._senderRegistry.get(senderId);
+        // If not found and we have a flowId, try to route based on flow
+        if (!entry && envelope.flowId) {
+            const originalSenderId = this._flowIdToSender.get(envelope.flowId);
+            if (originalSenderId) {
+                entry = this._senderRegistry.get(originalSenderId);
+                logger$7.debug('inpage_listener_routed_by_flow_id', {
+                    sender_id: senderId,
+                    original_sender_id: originalSenderId,
+                    flow_id: envelope.flowId,
+                    frame_type: envelope.frame?.type ?? 'unknown',
+                });
+            }
+        }
         if (!entry) {
             logger$7.debug('inpage_listener_no_connector_for_sender', {
                 sender_id: senderId,
+                flow_id: envelope.flowId,
                 frame_type: envelope.frame?.type ?? 'unknown',
             });
             return;
@@ -37144,6 +37486,15 @@ class InPageListener extends TransportListener {
         }
         this._senderRegistry.set(senderId, entry);
         this._systemToSender.set(entry.systemId, senderId);
+        // Track the flowId if present so we can route responses back
+        if (envelope.flowId) {
+            this._flowIdToSender.set(envelope.flowId, senderId);
+            logger$7.debug('inpage_listener_registered_flow_id', {
+                sender_id: senderId,
+                system_id: entry.systemId,
+                flow_id: envelope.flowId,
+            });
+        }
         await this._deliverEnvelope(entry, envelope);
     }
     async _createConnectorForAttach(params) {
@@ -37191,7 +37542,7 @@ class InPageListener extends TransportListener {
                 origin_type: originType,
                 connector_type: connector.constructor?.name ?? 'unknown',
             });
-            return { connector, systemId, originType };
+            return { connector, systemId, originType, senderId: params.senderId };
         }
         catch (error) {
             logger$7.error('inpage_listener_connector_creation_failed', {
@@ -37245,6 +37596,12 @@ class InPageListener extends TransportListener {
             if (this._systemToSender.get(systemId) === senderId) {
                 this._systemToSender.delete(systemId);
             }
+            // Clean up flowId mappings for this sender
+            for (const [flowId, sid] of this._flowIdToSender.entries()) {
+                if (sid === senderId) {
+                    this._flowIdToSender.delete(flowId);
+                }
+            }
         })
             .catch((error) => {
             logger$7.debug('inpage_listener_wait_until_closed_failed', {
@@ -37256,9 +37613,24 @@ class InPageListener extends TransportListener {
             if (this._systemToSender.get(systemId) === senderId) {
                 this._systemToSender.delete(systemId);
             }
+            // Clean up flowId mappings for this sender
+            for (const [flowId, sid] of this._flowIdToSender.entries()) {
+                if (sid === senderId) {
+                    this._flowIdToSender.delete(flowId);
+                }
+            }
         });
     }
     async _deliverEnvelope(entry, envelope) {
+        // Track flowId for routing responses back
+        if (envelope.flowId && !this._flowIdToSender.has(envelope.flowId)) {
+            this._flowIdToSender.set(envelope.flowId, entry.senderId);
+            logger$7.debug('inpage_listener_registered_flow_id_on_delivery', {
+                sender_id: entry.senderId,
+                system_id: entry.systemId,
+                flow_id: envelope.flowId,
+            });
+        }
         const message = this._buildChannelMessage({
             envelope,
             connector: entry.connector,