@principal-ai/control-tower-core 0.1.7 → 0.1.8

package/dist/adapters/mock/MockTransportAdapter.js

@@ -11,10 +11,12 @@ class MockTransportAdapter {
         this.simulateLatency = 0;
         this.shouldFailConnection = false;
         this.connectedUrl = null;
+        this.connectionAttempts = 0;
         this.simulateLatency = options?.simulateLatency ?? 0;
         this.shouldFailConnection = options?.shouldFailConnection ?? false;
     }
     async connect(url, _options) {
+        this.connectionAttempts++;
         if (this.shouldFailConnection) {
             this.state = 'disconnected';
             const error = new Error('Mock connection failed');
@@ -68,8 +70,8 @@ class MockTransportAdapter {
         return this.state === 'connected';
     }
     // Test helper methods
-    simulateMessage(message) {
-        if (this.state !== 'connected') {
+    simulateMessage(message, bypassConnectionCheck = false) {
+        if (!bypassConnectionCheck && this.state !== 'connected') {
             throw new Error('Cannot simulate message when not connected');
         }
         this.messageHandlers.forEach(handler => handler(message));
@@ -90,5 +92,102 @@ class MockTransportAdapter {
     getConnectedUrl() {
         return this.connectedUrl;
     }
+    getConnectionAttempts() {
+        return this.connectionAttempts;
+    }
+    resetConnectionAttempts() {
+        this.connectionAttempts = 0;
+    }
+    // Additional test helper methods for two-tier architecture testing
+    /**
+     * Simulate a client connection with authentication state
+     * Note: This bypasses the connected state check for testing purposes
+     */
+    async simulateConnection(clientId, options = {}) {
+        // Set transport to connected state if not already
+        if (this.state !== 'connected') {
+            this.state = 'connected';
+        }
+        const message = {
+            id: `conn-${clientId}`,
+            type: 'connection',
+            payload: {
+                clientId,
+                authenticated: options.authenticated ?? false,
+                userId: options.userId,
+                metadata: options.metadata
+            },
+            timestamp: Date.now()
+        };
+        // Use simulateMessage with bypass flag
+        this.simulateMessage(message, true);
+    }
+    /**
+     * Simulate a client disconnection
+     */
+    async simulateDisconnect(clientId, reason = 'Normal closure') {
+        // Send a disconnect message to the server for this specific client
+        const message = {
+            id: `disconnect-${clientId}`,
+            type: 'disconnect',
+            payload: {
+                clientId,
+                reason
+            },
+            timestamp: Date.now()
+        };
+        this.simulateMessage(message, true);
+    }
+    /**
+     * Simulate sending a message from a client to the server
+     * Properly wraps the message with clientId in payload for server routing
+     *
+     * @param clientId - The client sending the message
+     * @param messageType - The message type (e.g., 'join_room', 'leave_room', 'broadcast_event')
+     * @param messagePayload - The message payload
+     */
+    async simulateClientMessage(clientId, messageType, messagePayload = {}) {
+        const message = {
+            id: `msg-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`,
+            type: 'server_message',
+            payload: {
+                clientId,
+                type: messageType,
+                ...messagePayload
+            },
+            timestamp: Date.now()
+        };
+        this.simulateMessage(message, true);
+    }
+    /**
+     * Get all messages sent to a specific client
+     * This filters the message queue for messages addressed to the given client
+     */
+    getSentMessages(clientId) {
+        return this.messageQueue
+            .filter(msg => {
+            const payload = msg.payload;
+            return payload?.clientId === clientId;
+        })
+            .map(msg => {
+            const { clientId: _, ...rest } = msg.payload;
+            return rest;
+        });
+    }
+    /**
+     * Simulate an incoming message from the server to the client
+     * This is used in client tests to mock server responses
+     * @param message - The message to send to the client
+     */
+    simulateIncomingMessage(message) {
+        // Ensure message has required Message fields
+        const fullMessage = {
+            id: message.id || `msg-${Date.now()}`,
+            type: message.type,
+            payload: message.payload || {},
+            timestamp: message.timestamp || Date.now()
+        };
+        this.messageHandlers.forEach(handler => handler(fullMessage));
+    }
 }
 exports.MockTransportAdapter = MockTransportAdapter;

package/dist/adapters/websocket/WebSocketTransportAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WebSocketTransportAdapter.d.ts","sourceRoot":"","sources":["../../../src/adapters/websocket/WebSocketTransportAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,KAAK,EACV,eAAe,EACf,iBAAiB,EACjB,OAAO,EACP,cAAc,EACd,YAAY,EACZ,YAAY,EAGb,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,MAAM,CAAC;AACjD,OAAO,KAAK,EAAE,MAAM,IAAI,WAAW,EAAE,MAAM,OAAO,CAAC;AAEnD,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAEhD,UAAU,gBAAgB;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,SAAS,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,WAAW,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC;IAC7B,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,wBAAwB;IACvC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,qBAAa,yBAA0B,YAAW,iBAAiB;IACjE,OAAO,CAAC,KAAK,CAAmC;IAChD,OAAO,CAAC,eAAe,CAAkC;IACzD,OAAO,CAAC,aAAa,CAAgC;IACrD,OAAO,CAAC,aAAa,CAAgC;IAGrD,OAAO,CAAC,GAAG,CAAC,CAAkB;IAC9B,OAAO,CAAC,SAAS,CAAC,CAAS;IAG3B,OAAO,CAAC,cAAc,CAAC,CAA2B;IAClD,OAAO,CAAC,WAAW,CAAC,CAAkB;IACtC,OAAO,CAAC,aAAa,CAAC,CAAS;IAG/B,OAAO,CAAC,OAAO,CAAuC;IACtD,OAAO,CAAC,IAAI,CAA8C;IAG1D,OAAO,CAAC,WAAW,CAAC,CAAe;IACnC,OAAO,CAAC,MAAM,CAA2B;gBAE7B,MAAM,CAAC,EAAE,wBAAwB;IAU7C,cAAc,CAAC,IAAI,EAAE,YAAY,GAAG,IAAI;IAYlC,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAsCjE,MAAM,CAAC,MAAM,EAAE,UAAU,GAAG,WAAW,EAAE,IAAI,GAAE,MAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAiC7E,uBAAuB,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;YA2BpD,gBAAgB;YA6EhB,mBAAmB;YAuCnB,iBAAiB;IA4E/B,OAAO,CAAC,kBAAkB;IAO1B,OAAO,CAAC,YAAY;IAMd,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAiC3B,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA8B3C,SAAS,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI;IAIxC,OAAO,CAAC,OAAO,EAAE,YAAY,GAAG,IAAI;IAIpC,OAAO,CAAC,OAAO,EAAE,YAAY,GAAG,IAAI;IAIpC,QAAQ,IAAI,eAAe;IAI3B,WAAW,IAAI,OAAO;IAKtB,mBAAmB,IAAI,gBAAgB,EAAE;IAIzC,uBAAuB,IAAI,gBAAgB,EAAE;IAI7C,cAAc,IAAI,MAAM;IAIxB,OAAO,IAAI,YAAY,GAAG,aAAa;IAIvC,cAAc,IAAI,OAAO;IAIzB,OAAO,CAAC,UAAU;CAGnB"}
+{"version":3,"file":"WebSocketTransportAdapter.d.ts","sourceRoot":"","sources":["../../../src/adapters/websocket/WebSocketTransportAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,KAAK,EACV,eAAe,EACf,iBAAiB,EACjB,OAAO,EACP,cAAc,EACd,YAAY,EACZ,YAAY,EAGb,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,MAAM,CAAC;AACjD,OAAO,KAAK,EAAE,MAAM,IAAI,WAAW,EAAE,MAAM,OAAO,CAAC;AAEnD,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAEhD,UAAU,gBAAgB;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,SAAS,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,WAAW,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC;IAC7B,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,wBAAwB;IACvC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,qBAAa,yBAA0B,YAAW,iBAAiB;IACjE,OAAO,CAAC,KAAK,CAAmC;IAChD,OAAO,CAAC,eAAe,CAAkC;IACzD,OAAO,CAAC,aAAa,CAAgC;IACrD,OAAO,CAAC,aAAa,CAAgC;IAGrD,OAAO,CAAC,GAAG,CAAC,CAAkB;IAC9B,OAAO,CAAC,SAAS,CAAC,CAAS;IAG3B,OAAO,CAAC,cAAc,CAAC,CAA2B;IAClD,OAAO,CAAC,WAAW,CAAC,CAAkB;IACtC,OAAO,CAAC,aAAa,CAAC,CAAS;IAG/B,OAAO,CAAC,OAAO,CAAuC;IACtD,OAAO,CAAC,IAAI,CAA8C;IAG1D,OAAO,CAAC,WAAW,CAAC,CAAe;IACnC,OAAO,CAAC,MAAM,CAA2B;gBAE7B,MAAM,CAAC,EAAE,wBAAwB;IAU7C,cAAc,CAAC,IAAI,EAAE,YAAY,GAAG,IAAI;IAclC,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAsCjE,MAAM,CAAC,MAAM,EAAE,UAAU,GAAG,WAAW,EAAE,IAAI,GAAE,MAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAiC7E,uBAAuB,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;YA2BpD,gBAAgB;YA6EhB,mBAAmB;YAuCnB,iBAAiB;IA4E/B,OAAO,CAAC,kBAAkB;IAO1B,OAAO,CAAC,YAAY;IAMd,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAiC3B,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA8B3C,SAAS,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI;IAIxC,OAAO,CAAC,OAAO,EAAE,YAAY,GAAG,IAAI;IAIpC,OAAO,CAAC,OAAO,EAAE,YAAY,GAAG,IAAI;IAIpC,QAAQ,IAAI,eAAe;IAI3B,WAAW,IAAI,OAAO;IAKtB,mBAAmB,IAAI,gBAAgB,EAAE;IAIzC,uBAAuB,IAAI,gBAAgB,EAAE;IAI7C,cAAc,IAAI,MAAM;IAIxB,OAAO,IAAI,YAAY,GAAG,aAAa;IAIvC,cAAc,IAAI,OAAO;IAIzB,OAAO,CAAC,UAAU;CAGnB"}

package/dist/adapters/websocket/WebSocketTransportAdapter.js

@@ -21,11 +21,13 @@ class WebSocketTransportAdapter {
     // Set the auth adapter
     setAuthAdapter(auth) {
         this.authAdapter = auth;
-        // Update requireAuth based on auth adapter's preference
-        if (auth.isAuthRequired) {
+        // Use auth adapter's preference only if requireAuth is not already true
+        // This allows explicit requireAuth: true in config to take precedence
+        if (auth.isAuthRequired && !this.config.requireAuth) {
             this.config.requireAuth = auth.isAuthRequired();
         }
-        if (auth.getAuthTimeout) {
+        // For authTimeout, use adapter's value if not explicitly set (not matching default)
+        if (auth.getAuthTimeout && this.config.authTimeout === 5000) {
             this.config.authTimeout = auth.getAuthTimeout();
         }
     }