@loop_ouroboros/mcp-hub-lite 1.2.5 → 1.2.7

package/dist/server/tests/unit/services/hub-tools/instance-selector.test.js

@@ -17,8 +17,13 @@ describe('InstanceSelector', () => {
         headers: {},
         tags: {}
     };
+    // Mock statusChecker that simulates connected instances
+    const mockConnectedStatus = () => ({ connected: true });
+    const mockDisconnectedStatus = () => ({ connected: false });
     describe('random strategy', () => {
-        it('should select random instance from enabled instances', () => {
+        it('should select random instance from connected instances', () => {
+            // Local mock that simulates idx=2 being disconnected
+            const localMockConnectedStatus = (_name, idx) => idx === 2 ? { connected: false } : { connected: true };
             const config = {
                 template: {
                     ...baseTemplate,
@@ -31,11 +36,11 @@ describe('InstanceSelector', () => {
                 ],
                 tagDefinitions: []
             };
-            const selected = InstanceSelector.selectInstance('test-server', config);
+            const selected = InstanceSelector.selectInstance('test-server', config, undefined, localMockConnectedStatus);
             expect(selected).toBeDefined();
             expect(['1', '2']).toContain(selected.id);
         });
-        it('should return undefined when no enabled instances', () => {
+        it('should return undefined when no connected instances', () => {
             const config = {
                 template: {
                     ...baseTemplate,
@@ -47,12 +52,12 @@ describe('InstanceSelector', () => {
                 ],
                 tagDefinitions: []
             };
-            const selected = InstanceSelector.selectInstance('test-server', config);
+            const selected = InstanceSelector.selectInstance('test-server', config, undefined, mockDisconnectedStatus);
             expect(selected).toBeUndefined();
         });
     });
     describe('round-robin strategy', () => {
-        it('should cycle through enabled instances', () => {
+        it('should cycle through connected instances', () => {
             const config = {
                 template: {
                     ...baseTemplate,
@@ -65,10 +70,10 @@ describe('InstanceSelector', () => {
                 ],
                 tagDefinitions: []
             };
-            const selected1 = InstanceSelector.selectInstance('test-server-rr', config);
-            const selected2 = InstanceSelector.selectInstance('test-server-rr', config);
-            const selected3 = InstanceSelector.selectInstance('test-server-rr', config);
-            const selected4 = InstanceSelector.selectInstance('test-server-rr', config);
+            const selected1 = InstanceSelector.selectInstance('test-server-rr', config, undefined, mockConnectedStatus);
+            const selected2 = InstanceSelector.selectInstance('test-server-rr', config, undefined, mockConnectedStatus);
+            const selected3 = InstanceSelector.selectInstance('test-server-rr', config, undefined, mockConnectedStatus);
+            const selected4 = InstanceSelector.selectInstance('test-server-rr', config, undefined, mockConnectedStatus);
             expect(selected1.id).toBe('1');
             expect(selected2.id).toBe('2');
             expect(selected3.id).toBe('3');
@@ -91,7 +96,7 @@ describe('InstanceSelector', () => {
             };
             const selected = InstanceSelector.selectInstance('test-server', config, {
                 tags: { env: 'prod', region: 'us' }
-            });
+            }, mockConnectedStatus);
             expect(selected).toBeDefined();
             expect(selected.id).toBe('2');
         });
@@ -110,7 +115,7 @@ describe('InstanceSelector', () => {
             expect(() => {
                 InstanceSelector.selectInstance('test-server', config, {
                     tags: { env: 'staging' }
-                });
+                }, mockConnectedStatus);
             }).toThrow('No instance found matching tags');
         });
         it('should throw error when multiple instances match tags', () => {
@@ -128,7 +133,7 @@ describe('InstanceSelector', () => {
             expect(() => {
                 InstanceSelector.selectInstance('test-server', config, {
                     tags: { env: 'prod' }
-                });
+                }, mockConnectedStatus);
             }).toThrow('Multiple instances match tags');
         });
         it('should return the single instance when no tags provided and only one instance exists', () => {
@@ -140,7 +145,7 @@ describe('InstanceSelector', () => {
                 instances: [{ ...baseInstance, id: '1', index: 0 }],
                 tagDefinitions: []
             };
-            const selected = InstanceSelector.selectInstance('test-server', config);
+            const selected = InstanceSelector.selectInstance('test-server', config, undefined, mockConnectedStatus);
             expect(selected).toBeDefined();
             expect(selected.id).toBe('1');
         });
@@ -157,7 +162,7 @@ describe('InstanceSelector', () => {
                 tagDefinitions: []
             };
             expect(() => {
-                InstanceSelector.selectInstance('test-server', config);
+                InstanceSelector.selectInstance('test-server', config, undefined, mockConnectedStatus);
             }).toThrow('No tags provided for tag-match-unique strategy with 2 instances. Available: [0:{}, 1:{}]. Pass matching tags to select.');
         });
     });
@@ -171,7 +176,7 @@ describe('InstanceSelector', () => {
                 instances: [{ ...baseInstance, id: '1', index: 0 }],
                 tagDefinitions: []
             };
-            const selected = InstanceSelector.selectInstance('test-server', config);
+            const selected = InstanceSelector.selectInstance('test-server', config, undefined, mockConnectedStatus);
             expect(selected).toBeDefined();
             expect(selected.id).toBe('1');
         });
@@ -187,7 +192,7 @@ describe('InstanceSelector', () => {
                 tagDefinitions: []
                 // No instanceSelectionStrategy field
             };
-            const selected = InstanceSelector.selectInstance('test-server', config);
+            const selected = InstanceSelector.selectInstance('test-server', config, undefined, mockConnectedStatus);
             expect(selected).toBeDefined();
             expect(['1', '2']).toContain(selected.id);
         });

package/dist/server/tests/unit/services/hub-tools.service.test.js

@@ -36,6 +36,7 @@ describe('HubToolsService', () => {
                         instances: [
                             {
                                 id: 'test-server-1-instance',
+                                index: 0,
                                 enabled: true,
                                 args: [],
                                 env: {},
@@ -62,6 +63,7 @@ describe('HubToolsService', () => {
                         instances: [
                             {
                                 id: 'test-server-2-instance',
+                                index: 0,
                                 enabled: true,
                                 args: [],
                                 env: {},
@@ -82,13 +84,11 @@ describe('HubToolsService', () => {
                 const server = mockServers.find((s) => s.name === name);
                 return server?.config;
             });
-            vi.mocked(mcpConnectionManager.getStatusByName).mockImplementation(() => {
-                return {
-                    connected: true,
-                    lastCheck: Date.now(),
-                    toolsCount: 0,
-                    resourcesCount: 0
-                };
+            vi.mocked(mcpConnectionManager.getConnectedIndexes).mockImplementation(() => {
+                return [0];
+            });
+            vi.mocked(mcpConnectionManager.getStatus).mockImplementation(() => {
+                return { connected: true, lastCheck: Date.now(), toolsCount: 0, resourcesCount: 0 };
             });
             // Act
             const servers = await hubToolsService.listServers();
@@ -118,6 +118,7 @@ describe('HubToolsService', () => {
                         instances: [
                             {
                                 id: 'server1-instance',
+                                index: 0,
                                 enabled: true,
                                 args: [],
                                 env: {},
@@ -138,13 +139,11 @@ describe('HubToolsService', () => {
                 const server = mockServers.find((s) => s.name === name);
                 return server?.config;
             });
-            vi.mocked(mcpConnectionManager.getStatusByName).mockImplementation(() => {
-                return {
-                    connected: true,
-                    lastCheck: Date.now(),
-                    toolsCount: 0,
-                    resourcesCount: 0
-                };
+            vi.mocked(mcpConnectionManager.getConnectedIndexes).mockImplementation(() => {
+                return [0];
+            });
+            vi.mocked(mcpConnectionManager.getStatus).mockImplementation(() => {
+                return { connected: true, lastCheck: Date.now(), toolsCount: 0, resourcesCount: 0 };
             });
             // Act
             const servers = await hubToolsService.listServers();
@@ -173,6 +172,7 @@ describe('HubToolsService', () => {
                         instances: [
                             {
                                 id: 'filesystem-instance',
+                                index: 0,
                                 enabled: true,
                                 args: [],
                                 env: {},
@@ -200,6 +200,7 @@ describe('HubToolsService', () => {
                         instances: [
                             {
                                 id: 'time-instance',
+                                index: 0,
                                 enabled: true,
                                 args: [],
                                 env: {},
@@ -220,13 +221,11 @@ describe('HubToolsService', () => {
                 const server = mockServers.find((s) => s.name === name);
                 return server?.config;
             });
-            vi.mocked(mcpConnectionManager.getStatusByName).mockImplementation(() => {
-                return {
-                    connected: true,
-                    lastCheck: Date.now(),
-                    toolsCount: 0,
-                    resourcesCount: 0
-                };
+            vi.mocked(mcpConnectionManager.getConnectedIndexes).mockImplementation(() => {
+                return [0];
+            });
+            vi.mocked(mcpConnectionManager.getStatus).mockImplementation(() => {
+                return { connected: true, lastCheck: Date.now(), toolsCount: 0, resourcesCount: 0 };
             });
             // Act
             const servers = await hubToolsService.listServers();
@@ -256,6 +255,7 @@ describe('HubToolsService', () => {
                         instances: [
                             {
                                 id: 'connected-server-instance',
+                                index: 0,
                                 enabled: true,
                                 args: [],
                                 env: {},
@@ -303,21 +303,14 @@ describe('HubToolsService', () => {
                 const server = mockServers.find((s) => s.name === name);
                 return server?.config;
             });
-            vi.mocked(mcpConnectionManager.getStatusByName).mockImplementation((name) => {
+            vi.mocked(mcpConnectionManager.getConnectedIndexes).mockImplementation((name) => {
                 if (name === 'Connected Server') {
-                    return {
-                        connected: true,
-                        lastCheck: Date.now(),
-                        toolsCount: 0,
-                        resourcesCount: 0
-                    };
+                    return [0];
                 }
-                return {
-                    connected: false,
-                    lastCheck: Date.now(),
-                    toolsCount: 0,
-                    resourcesCount: 0
-                };
+                return [];
+            });
+            vi.mocked(mcpConnectionManager.getStatus).mockImplementation(() => {
+                return { connected: true, lastCheck: Date.now(), toolsCount: 0, resourcesCount: 0 };
             });
             // Act
             const servers = await hubToolsService.listServers();
@@ -380,6 +373,7 @@ describe('HubToolsService', () => {
                 tagDefinitions: []
             });
             vi.mocked(mcpConnectionManager.getToolsByServerName).mockReturnValue(mockTools);
+            vi.mocked(mcpConnectionManager.getConnectedIndexes).mockReturnValue([0]);
             // Act
             const result = await hubToolsService.listToolsInServer({ serverName });
             // Assert
@@ -392,7 +386,7 @@ describe('HubToolsService', () => {
         it('should throw error if server not found', async () => {
             // Arrange
             const serverName = 'Non-existent Server';
-            vi.mocked(mcpConnectionManager.getToolsByServerName).mockReturnValue([]);
+            vi.mocked(mcpConnectionManager.getConnectedIndexes).mockReturnValue([]);
             // Act & Assert
             await expect(hubToolsService.listToolsInServer({ serverName })).rejects.toThrow(`Server not found: ${serverName}`);
         });
@@ -440,6 +434,7 @@ describe('HubToolsService', () => {
                 tagDefinitions: []
             });
             vi.mocked(mcpConnectionManager.getToolsByServerName).mockReturnValue(mockTools);
+            vi.mocked(mcpConnectionManager.getConnectedIndexes).mockReturnValue([0]);
             // Act
             const tool = await hubToolsService.getTool({ serverName, toolName });
             // Assert
@@ -480,6 +475,8 @@ describe('HubToolsService', () => {
                 instances: [mockInstance],
                 tagDefinitions: []
             });
+            vi.mocked(mcpConnectionManager.getToolsByServerName).mockReturnValue(mockTools);
+            vi.mocked(mcpConnectionManager.getConnectedIndexes).mockReturnValue([0]);
             vi.mocked(mcpConnectionManager.getTools).mockReturnValue(mockTools);
             // Act
             const tool = await hubToolsService.getTool({ serverName, toolName });
@@ -681,6 +678,7 @@ describe('HubToolsService', () => {
             vi.mocked(mcpConnectionManager.getResources).mockReturnValue([
                 { uri: 'test://resource', name: 'Test Resource' }
             ]);
+            vi.mocked(mcpConnectionManager.getConnectedIndexes).mockReturnValue([0]);
             // Act
             const resources = await hubToolsService.listResources();
             // Assert - the resource list should include use-guide and at least the server resource
@@ -747,6 +745,7 @@ describe('HubToolsService', () => {
                 instances: [
                     {
                         id: 'test-instance',
+                        index: 0,
                         enabled: true,
                         args: [],
                         env: {},
@@ -792,6 +791,7 @@ describe('HubToolsService', () => {
             const serverName = 'Test Server';
             const mockInstance = {
                 id: '1',
+                index: 0,
                 enabled: true,
                 args: [],
                 env: {},
@@ -817,6 +817,7 @@ describe('HubToolsService', () => {
             const serverName = 'Test Server';
             const mockInstance = {
                 id: '1',
+                index: 0,
                 enabled: true,
                 args: [],
                 env: {},

package/dist/server/tests/unit/utils/network-security.test.d.ts

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

package/dist/server/tests/unit/utils/network-security.test.d.ts.map

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

package/dist/server/tests/unit/utils/network-security.test.js

@@ -0,0 +1,123 @@
+import { describe, it, expect } from 'vitest';
+import { ip4ToInt, normalizeIp, parseCidr, isIpAllowed } from '../../../src/utils/network-security.js';
+describe('network-security', () => {
+    describe('ip4ToInt', () => {
+        it('should convert standard IPv4 to 32-bit integer', () => {
+            expect(ip4ToInt('192.168.1.1')).toBe(0xc0a80101);
+            expect(ip4ToInt('0.0.0.0')).toBe(0);
+            expect(ip4ToInt('255.255.255.255')).toBe(0xffffffff >>> 0);
+            expect(ip4ToInt('127.0.0.1')).toBe(0x7f000001);
+            expect(ip4ToInt('10.0.0.0')).toBe(0x0a000000);
+        });
+        it('should return NaN for invalid format', () => {
+            expect(ip4ToInt('')).toBeNaN();
+            expect(ip4ToInt('abc')).toBeNaN();
+            expect(ip4ToInt('1.2.3.4.5')).toBeNaN();
+            expect(ip4ToInt('1.2.3')).toBeNaN();
+        });
+        it('should return NaN for out-of-range octets', () => {
+            expect(ip4ToInt('256.1.1.1')).toBeNaN();
+            expect(ip4ToInt('1.1.1.-1')).toBeNaN();
+            expect(ip4ToInt('1.1.1.999')).toBeNaN();
+        });
+        it('should return NaN for non-numeric octets', () => {
+            expect(ip4ToInt('1.2.3.abc')).toBeNaN();
+            expect(ip4ToInt('1.2.3.1.1')).toBeNaN();
+        });
+    });
+    describe('normalizeIp', () => {
+        it('should return IPv4 unchanged', () => {
+            expect(normalizeIp('192.168.1.1')).toBe('192.168.1.1');
+            expect(normalizeIp('127.0.0.1')).toBe('127.0.0.1');
+        });
+        it('should strip ::ffff: prefix from IPv4-mapped IPv6', () => {
+            expect(normalizeIp('::ffff:192.168.1.1')).toBe('192.168.1.1');
+            expect(normalizeIp('::ffff:127.0.0.1')).toBe('127.0.0.1');
+            expect(normalizeIp('::ffff:10.0.0.1')).toBe('10.0.0.1');
+        });
+        it('should map ::1 to 127.0.0.1', () => {
+            expect(normalizeIp('::1')).toBe('127.0.0.1');
+        });
+        it('should return bare IPv6 unchanged', () => {
+            expect(normalizeIp('fe80::1')).toBe('fe80::1');
+            expect(normalizeIp('::1:2:3:4')).toBe('::1:2:3:4');
+        });
+        it('should handle empty/falsy values', () => {
+            expect(normalizeIp('')).toBe('');
+        });
+    });
+    describe('parseCidr', () => {
+        it('should parse standard CIDR notation', () => {
+            const result = parseCidr('192.168.1.0/24');
+            expect(result).not.toBeNull();
+            expect(result.network).toBe(0xc0a80100);
+            expect(result.mask).toBe(0xffffff00);
+        });
+        it('should handle /32 prefix (single host)', () => {
+            const result = parseCidr('10.0.0.1/32');
+            expect(result).not.toBeNull();
+            expect(result.network).toBe(0x0a000001);
+            expect(result.mask).toBe(0xffffffff);
+        });
+        it('should handle /0 prefix (match all)', () => {
+            const result = parseCidr('0.0.0.0/0');
+            expect(result).not.toBeNull();
+            expect(result.mask).toBe(0);
+        });
+        it('should assume /32 when no prefix given', () => {
+            const result = parseCidr('192.168.1.1');
+            expect(result).not.toBeNull();
+            expect(result.network).toBe(0xc0a80101);
+            expect(result.mask).toBe(0xffffffff);
+        });
+        it('should return null for invalid prefix', () => {
+            expect(parseCidr('192.168.1.0/33')).toBeNull();
+            expect(parseCidr('192.168.1.0/-1')).toBeNull();
+            expect(parseCidr('192.168.1.0/abc')).toBeNull();
+        });
+        it('should return null for invalid IP in CIDR', () => {
+            expect(parseCidr('256.1.1.0/24')).toBeNull();
+            expect(parseCidr('abc/24')).toBeNull();
+        });
+        it('should return null for empty or null input', () => {
+            expect(parseCidr('')).toBeNull();
+        });
+    });
+    describe('isIpAllowed', () => {
+        const defaults = ['127.0.0.1', '192.168.0.0/16', '10.0.0.0/8'];
+        it('should allow IP matching a CIDR', () => {
+            expect(isIpAllowed('192.168.1.1', defaults)).toBe(true);
+            expect(isIpAllowed('10.0.0.1', defaults)).toBe(true);
+            expect(isIpAllowed('10.255.255.255', defaults)).toBe(true);
+        });
+        it('should reject IP not matching any CIDR', () => {
+            expect(isIpAllowed('1.2.3.4', defaults)).toBe(false);
+            expect(isIpAllowed('8.8.8.8', defaults)).toBe(false);
+        });
+        it('should allow all when list is empty', () => {
+            expect(isIpAllowed('1.2.3.4', [])).toBe(true);
+            expect(isIpAllowed('8.8.8.8', [])).toBe(true);
+        });
+        it('should reject invalid IPs (safety default)', () => {
+            expect(isIpAllowed('', defaults)).toBe(false);
+            expect(isIpAllowed('invalid', defaults)).toBe(false);
+            expect(isIpAllowed('256.1.1.1', defaults)).toBe(false);
+        });
+        it('should match IPv4-mapped IPv6 addresses', () => {
+            expect(isIpAllowed('::ffff:192.168.1.1', defaults)).toBe(true);
+            expect(isIpAllowed('::ffff:10.0.0.1', defaults)).toBe(true);
+            expect(isIpAllowed('::ffff:1.2.3.4', defaults)).toBe(false);
+        });
+        it('should match ::1 as localhost', () => {
+            expect(isIpAllowed('::1', defaults)).toBe(true);
+        });
+        it('should skip invalid CIDR entries silently', () => {
+            expect(isIpAllowed('192.168.1.1', ['invalid/24', '192.168.0.0/16'])).toBe(true);
+            expect(isIpAllowed('1.2.3.4', ['invalid/24'])).toBe(false);
+        });
+        it('should handle /32 exact match', () => {
+            expect(isIpAllowed('192.168.1.1', ['192.168.1.1/32'])).toBe(true);
+            expect(isIpAllowed('192.168.1.2', ['192.168.1.1/32'])).toBe(false);
+        });
+    });
+});

package/dist/server/vite.config.js

@@ -118,7 +118,7 @@ export default defineConfig({
     server: {
         host: '127.0.0.1', // Explicitly use IPv4 address
         port: 5173, // Use common port number to avoid permission issues
-        strictPort: true, // Allow automatic selection of available port
+        strictPort: false, // Auto-increment port if occupied
         proxy: {
             '/api': {
                 target: `http://${backendHost}:${backendPort}`,