@loop_ouroboros/mcp-hub-lite 1.0.2 → 1.1.1

package/dist/server/tests/unit/server/runner.test.js

@@ -7,6 +7,19 @@ import { mcpConnectionManager } from '../../../src/services/mcp-connection-manag
 import { gateway } from '../../../src/services/gateway.service.js';
 import { PidManager } from '../../../src/pid/manager.js';
 import { checkPort } from '../../../src/utils/port-checker.js';
+// Mock resolveInstanceConfig to return a valid resolved config
+vi.mock('@config/config-migrator.js', () => ({
+    resolveInstanceConfig: vi.fn(() => ({
+        command: 'test-command',
+        args: [],
+        type: 'stdio',
+        timeout: 30000,
+        aggregatedTools: [],
+        tags: {},
+        enabled: true
+    })),
+    getEnabledInstances: vi.fn()
+}));
 // Mock all dependencies
 vi.mock('@src/app.js', () => ({
     buildApp: vi.fn()
@@ -15,7 +28,7 @@ vi.mock('@config/config-manager.js', () => ({
     configManager: {
         getConfig: vi.fn(),
         getServers: vi.fn(),
-        getServerInstanceByName: vi.fn(),
+        getServerInstancesByName: vi.fn(),
         addServerInstance: vi.fn()
     }
 }));
@@ -72,7 +85,7 @@ describe('Server Runner', () => {
             };
             vi.mocked(buildApp).mockResolvedValue(mockApp);
             const mockConfig = {
-                version: '1.0.0',
+                version: '1.1.0',
                 system: {
                     host: 'localhost',
                     port: 3000,
@@ -83,7 +96,7 @@ describe('Server Runner', () => {
                         rotationAge: '7d',
                         jsonPretty: true,
                         mcpCommDebug: false,
-                        sessionDebug: false
+                        apiDebug: false
                     }
                 },
                 security: {
@@ -91,11 +104,10 @@ describe('Server Runner', () => {
                     maxConcurrentConnections: 50,
                     connectionTimeout: 30000,
                     idleConnectionTimeout: 300000,
-                    sessionTimeout: 30 * 60 * 1000,
-                    sessionFlushInterval: 15 * 60 * 1000,
                     maxConnections: 50
                 },
-                servers: {}
+                servers: {},
+                tagDefinitions: []
             };
             vi.mocked(configManager.getConfig).mockReturnValue(mockConfig);
             vi.mocked(configManager.getServers).mockReturnValue([]);
@@ -111,7 +123,7 @@ describe('Server Runner', () => {
         it('should start server in stdio mode successfully', async () => {
             // Setup mocks
             const mockConfig = {
-                version: '1.0.0',
+                version: '1.1.0',
                 system: {
                     host: 'localhost',
                     port: 3000,
@@ -122,7 +134,7 @@ describe('Server Runner', () => {
                         rotationAge: '7d',
                         jsonPretty: true,
                         mcpCommDebug: false,
-                        sessionDebug: false
+                        apiDebug: false
                     }
                 },
                 security: {
@@ -130,11 +142,10 @@ describe('Server Runner', () => {
                     maxConcurrentConnections: 50,
                     connectionTimeout: 30000,
                     idleConnectionTimeout: 300000,
-                    sessionTimeout: 30 * 60 * 1000,
-                    sessionFlushInterval: 15 * 60 * 1000,
                     maxConnections: 50
                 },
-                servers: {}
+                servers: {},
+                tagDefinitions: []
             };
             vi.mocked(configManager.getConfig).mockReturnValue(mockConfig);
             vi.mocked(configManager.getServers).mockReturnValue([]);
@@ -152,7 +163,7 @@ describe('Server Runner', () => {
             const mockApp = { listen: vi.fn(), close: vi.fn() };
             vi.mocked(buildApp).mockResolvedValue(mockApp);
             const mockConfig = {
-                version: '1.0.0',
+                version: '1.1.0',
                 system: {
                     host: 'localhost',
                     port: 3000,
@@ -163,7 +174,7 @@ describe('Server Runner', () => {
                         rotationAge: '7d',
                         jsonPretty: true,
                         mcpCommDebug: false,
-                        sessionDebug: false
+                        apiDebug: false
                     }
                 },
                 security: {
@@ -171,11 +182,10 @@ describe('Server Runner', () => {
                     maxConcurrentConnections: 50,
                     connectionTimeout: 30000,
                     idleConnectionTimeout: 300000,
-                    sessionTimeout: 30 * 60 * 1000,
-                    sessionFlushInterval: 15 * 60 * 1000,
                     maxConnections: 50
                 },
-                servers: {}
+                servers: {},
+                tagDefinitions: []
             };
             vi.mocked(configManager.getConfig).mockReturnValue(mockConfig);
             vi.mocked(configManager.getServers).mockReturnValue([]);
@@ -191,7 +201,8 @@ describe('Server Runner', () => {
             // Execute and expect error
             await expect(runServer({ stdio: false, port: 3000, host: 'localhost' })).rejects.toThrow('process.exit called');
             // Verify
-            expect(logger.error).toHaveBeenCalledWith('MCP Hub Lite is already running on port 3000 (PID: 1234)');
+            expect(logger.error).toHaveBeenCalledWith('MCP Hub Lite is already running on port 3000 (PID: 1234)', expect.any(Object));
+            expect(logger.error).toHaveBeenCalledWith("Use 'npm run stop' or 'mcp-hub-lite stop' to stop the running instance.", expect.any(Object));
             expect(exitSpy).toHaveBeenCalledWith(1);
             // Restore
             exitSpy.mockRestore();
@@ -201,7 +212,7 @@ describe('Server Runner', () => {
             const mockApp = { listen: vi.fn(), close: vi.fn() };
             vi.mocked(buildApp).mockResolvedValue(mockApp);
             const mockConfig = {
-                version: '1.0.0',
+                version: '1.1.0',
                 system: {
                     host: 'localhost',
                     port: 3000,
@@ -212,7 +223,7 @@ describe('Server Runner', () => {
                         rotationAge: '7d',
                         jsonPretty: true,
                         mcpCommDebug: false,
-                        sessionDebug: false
+                        apiDebug: false
                     }
                 },
                 security: {
@@ -220,11 +231,10 @@ describe('Server Runner', () => {
                     maxConcurrentConnections: 50,
                     connectionTimeout: 30000,
                     idleConnectionTimeout: 300000,
-                    sessionTimeout: 30 * 60 * 1000,
-                    sessionFlushInterval: 15 * 60 * 1000,
                     maxConnections: 50
                 },
-                servers: {}
+                servers: {},
+                tagDefinitions: []
             };
             vi.mocked(configManager.getConfig).mockReturnValue(mockConfig);
             vi.mocked(configManager.getServers).mockReturnValue([]);
@@ -242,9 +252,10 @@ describe('Server Runner', () => {
             // Execute and expect error
             await expect(runServer({ stdio: false, port: 3000, host: 'localhost' })).rejects.toThrow('process.exit called');
             // Verify
-            expect(logger.error).toHaveBeenCalledWith('Port 3000 is already in use by another application:');
-            expect(logger.error).toHaveBeenCalledWith('  Process: other-app (PID: 5678)');
-            expect(logger.error).toHaveBeenCalledWith('  Command: node other-app.js');
+            expect(logger.error).toHaveBeenCalledWith('Port 3000 is already in use by another application:', expect.any(Object));
+            expect(logger.error).toHaveBeenCalledWith('  Process: other-app (PID: 5678)', expect.any(Object));
+            expect(logger.error).toHaveBeenCalledWith('  Command: node other-app.js', expect.any(Object));
+            expect(logger.error).toHaveBeenCalledWith('Please stop the conflicting application or use a different port.', expect.any(Object));
             expect(exitSpy).toHaveBeenCalledWith(1);
             // Restore
             exitSpy.mockRestore();
@@ -257,7 +268,7 @@ describe('Server Runner', () => {
             };
             vi.mocked(buildApp).mockResolvedValue(mockApp);
             const mockConfig = {
-                version: '1.0.0',
+                version: '1.1.0',
                 system: {
                     host: 'localhost',
                     port: 3000,
@@ -268,7 +279,7 @@ describe('Server Runner', () => {
                         rotationAge: '7d',
                         jsonPretty: true,
                         mcpCommDebug: false,
-                        sessionDebug: false
+                        apiDebug: false
                     }
                 },
                 security: {
@@ -276,11 +287,10 @@ describe('Server Runner', () => {
                     maxConcurrentConnections: 50,
                     connectionTimeout: 30000,
                     idleConnectionTimeout: 300000,
-                    sessionTimeout: 30 * 60 * 1000,
-                    sessionFlushInterval: 15 * 60 * 1000,
                     maxConnections: 50
                 },
-                servers: {}
+                servers: {},
+                tagDefinitions: []
             };
             vi.mocked(configManager.getConfig).mockReturnValue(mockConfig);
             vi.mocked(checkPort).mockResolvedValue({ inUse: false });
@@ -288,36 +298,53 @@ describe('Server Runner', () => {
                 {
                     name: 'enabled-server',
                     config: {
-                        enabled: true,
-                        command: 'test-command',
-                        type: 'stdio',
-                        args: [],
-                        allowedTools: [],
-                        timeout: 30000
+                        template: {
+                            command: 'test-command',
+                            type: 'stdio',
+                            args: [],
+                            env: {},
+                            headers: {},
+                            aggregatedTools: [],
+                            timeout: 30000
+                        },
+                        instances: [
+                            { id: 'instance-1', enabled: true, args: [], env: {}, headers: {}, tags: {} }
+                        ],
+                        tagDefinitions: []
                     }
                 },
                 {
                     name: 'disabled-server',
                     config: {
-                        enabled: false,
-                        command: 'test-command',
-                        type: 'stdio',
-                        args: [],
-                        allowedTools: [],
-                        timeout: 30000
+                        template: {
+                            command: 'test-command',
+                            type: 'stdio',
+                            args: [],
+                            env: {},
+                            headers: {},
+                            aggregatedTools: [],
+                            timeout: 30000
+                        },
+                        instances: [
+                            { id: 'instance-2', enabled: false, args: [], env: {}, headers: {}, tags: {} }
+                        ],
+                        tagDefinitions: []
                     }
                 }
             ];
             vi.mocked(configManager.getServers).mockReturnValue(mockServers);
-            vi.mocked(configManager.getServerInstanceByName).mockImplementation((name) => {
+            vi.mocked(configManager.getServerInstancesByName).mockImplementation((name) => {
                 if (name === 'enabled-server')
                     return [];
-                return [{ id: 'instance-1', timestamp: Date.now(), hash: 'test-hash' }];
+                return [{ id: 'instance-1', enabled: false, args: [], env: {}, headers: {}, tags: {} }];
             });
             vi.mocked(configManager.addServerInstance).mockResolvedValue({
                 id: 'new-instance',
-                timestamp: Date.now(),
-                hash: 'test-hash'
+                enabled: true,
+                args: [],
+                env: {},
+                headers: {},
+                tags: {}
             });
             // Execute
             await runServer({ stdio: false, port: 3000, host: 'localhost' });
@@ -325,7 +352,7 @@ describe('Server Runner', () => {
             // Only enabled server should be connected (1 call expected)
             expect(mcpConnectionManager.connect).toHaveBeenCalledTimes(1);
             // Call for enabled server with new instance
-            expect(mcpConnectionManager.connect).toHaveBeenCalledWith(expect.objectContaining({
+            expect(mcpConnectionManager.connect).toHaveBeenCalledWith('enabled-server', 0, expect.objectContaining({
                 enabled: true,
                 command: 'test-command',
                 id: 'new-instance'
@@ -339,7 +366,7 @@ describe('Server Runner', () => {
             };
             vi.mocked(buildApp).mockResolvedValue(mockApp);
             const mockConfig = {
-                version: '1.0.0',
+                version: '1.1.0',
                 system: {
                     host: 'localhost',
                     port: 3000,
@@ -350,7 +377,7 @@ describe('Server Runner', () => {
                         rotationAge: '7d',
                         jsonPretty: true,
                         mcpCommDebug: false,
-                        sessionDebug: false
+                        apiDebug: false
                     }
                 },
                 security: {
@@ -358,11 +385,10 @@ describe('Server Runner', () => {
                     maxConcurrentConnections: 50,
                     connectionTimeout: 30000,
                     idleConnectionTimeout: 300000,
-                    sessionTimeout: 30 * 60 * 1000,
-                    sessionFlushInterval: 15 * 60 * 1000,
                     maxConnections: 50
                 },
-                servers: {}
+                servers: {},
+                tagDefinitions: []
             };
             vi.mocked(configManager.getConfig).mockReturnValue(mockConfig);
             vi.mocked(configManager.getServers).mockReturnValue([]);
@@ -394,7 +420,7 @@ describe('Server Runner', () => {
             };
             vi.mocked(buildApp).mockResolvedValue(mockApp);
             const mockConfig = {
-                version: '1.0.0',
+                version: '1.1.0',
                 system: {
                     host: 'localhost',
                     port: 3000,
@@ -405,7 +431,7 @@ describe('Server Runner', () => {
                         rotationAge: '7d',
                         jsonPretty: true,
                         mcpCommDebug: false,
-                        sessionDebug: false
+                        apiDebug: false
                     }
                 },
                 security: {
@@ -413,11 +439,10 @@ describe('Server Runner', () => {
                     maxConcurrentConnections: 50,
                     connectionTimeout: 30000,
                     idleConnectionTimeout: 300000,
-                    sessionTimeout: 30 * 60 * 1000,
-                    sessionFlushInterval: 15 * 60 * 1000,
                     maxConnections: 50
                 },
-                servers: {}
+                servers: {},
+                tagDefinitions: []
             };
             vi.mocked(configManager.getConfig).mockReturnValue(mockConfig);
             vi.mocked(configManager.getServers).mockReturnValue([]);
@@ -445,7 +470,7 @@ describe('Server Runner', () => {
             // Setup mocks to throw error
             vi.mocked(buildApp).mockRejectedValue(new Error('Startup failed'));
             const mockConfig = {
-                version: '1.0.0',
+                version: '1.1.0',
                 system: {
                     host: 'localhost',
                     port: 3000,
@@ -456,7 +481,7 @@ describe('Server Runner', () => {
                         rotationAge: '7d',
                         jsonPretty: true,
                         mcpCommDebug: false,
-                        sessionDebug: false
+                        apiDebug: false
                     }
                 },
                 security: {
@@ -464,11 +489,10 @@ describe('Server Runner', () => {
                     maxConcurrentConnections: 50,
                     connectionTimeout: 30000,
                     idleConnectionTimeout: 300000,
-                    sessionTimeout: 30 * 60 * 1000,
-                    sessionFlushInterval: 15 * 60 * 1000,
                     maxConnections: 50
                 },
-                servers: {}
+                servers: {},
+                tagDefinitions: []
             };
             vi.mocked(configManager.getConfig).mockReturnValue(mockConfig);
             // Spy on process.exit

package/dist/server/tests/unit/services/connection/connection-manager.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=connection-manager.test.d.ts.map

package/dist/server/tests/unit/services/connection/connection-manager.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"connection-manager.test.d.ts","sourceRoot":"","sources":["../../../../../../tests/unit/services/connection/connection-manager.test.ts"],"names":[],"mappings":""}

package/dist/server/tests/unit/services/connection/connection-manager.test.js

@@ -0,0 +1,112 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { McpConnectionManager } from '../../../../src/services/connection/connection-manager.js';
+// Mock dependencies
+vi.mock('@utils/logger.js', () => ({
+    logger: {
+        info: vi.fn(),
+        error: vi.fn(),
+        warn: vi.fn(),
+        debug: vi.fn()
+    },
+    LOG_MODULES: {
+        CONNECTION_MANAGER: 'connection-manager'
+    },
+    formatMcpMessageForLogging: vi.fn(),
+    logNotificationMessage: vi.fn()
+}));
+vi.mock('@utils/json-utils.js', () => ({
+    getMcpCommDebugSetting: vi.fn().mockReturnValue(false)
+}));
+vi.mock('@services/log-storage.service.js', () => ({
+    logStorage: {
+        append: vi.fn()
+    }
+}));
+vi.mock('@services/event-bus.service.js', () => ({
+    eventBus: {
+        subscribe: vi.fn(),
+        publish: vi.fn()
+    },
+    EventTypes: {
+        SERVER_DELETED: 'server-deleted',
+        SERVER_CONNECTED: 'server-connected',
+        SERVER_DISCONNECTED: 'server-disconnected',
+        SERVER_STATUS_CHANGE: 'server-status-change',
+        TOOLS_UPDATED: 'tools-updated',
+        RESOURCES_UPDATED: 'resources-updated'
+    }
+}));
+vi.mock('@services/hub-manager.service.js', () => ({
+    hubManager: {
+        getServerById: vi.fn(),
+        getServerInstancesByName: vi.fn()
+    }
+}));
+vi.mock('@utils/transports/transport-factory.js', () => ({
+    TransportFactory: {
+        createTransport: vi.fn()
+    }
+}));
+vi.mock('@modelcontextprotocol/sdk/client/index.js', () => ({
+    Client: vi.fn().mockImplementation(() => ({
+        connect: vi.fn(),
+        getServerVersion: vi.fn().mockReturnValue({ version: '1.0.0' }),
+        listTools: vi.fn().mockResolvedValue({ tools: [] }),
+        close: vi.fn()
+    }))
+}));
+describe('McpConnectionManager - Stdio Retry Mechanism', () => {
+    let manager;
+    beforeEach(() => {
+        vi.clearAllMocks();
+        manager = new McpConnectionManager();
+    });
+    describe('isProcessRunning helper', () => {
+        it('should have a private isProcessRunning method', () => {
+            // Verify that isProcessRunning is a method (private)
+            expect(typeof manager
+                .isProcessRunning).toBe('function');
+        });
+    });
+    describe('connection retry configuration', () => {
+        it('should define retry constants', () => {
+            // The constants are private to the connect method, but we can verify
+            // that the class structure is correct
+            expect(manager).toBeInstanceOf(McpConnectionManager);
+        });
+    });
+    describe('status management', () => {
+        it('should provide getStatus method', () => {
+            expect(typeof manager.getStatus).toBe('function');
+        });
+        it('should return undefined for non-existent server', () => {
+            const status = manager.getStatus('non-existent-server');
+            expect(status).toBeUndefined();
+        });
+    });
+    describe('disconnect methods', () => {
+        it('should provide disconnect method', () => {
+            expect(typeof manager.disconnect).toBe('function');
+        });
+        it('should provide disconnectAll method', () => {
+            expect(typeof manager.disconnectAll).toBe('function');
+        });
+    });
+    describe('tool and resource methods', () => {
+        it('should provide refreshTools method', () => {
+            expect(typeof manager.refreshTools).toBe('function');
+        });
+        it('should provide refreshResources method', () => {
+            expect(typeof manager.refreshResources).toBe('function');
+        });
+        it('should provide getTools method', () => {
+            expect(typeof manager.getTools).toBe('function');
+        });
+        it('should provide getResources method', () => {
+            expect(typeof manager.getResources).toBe('function');
+        });
+        it('should provide getAllTools method', () => {
+            expect(typeof manager.getAllTools).toBe('function');
+        });
+    });
+});