@onlineapps/conn-base-hub 1.0.5 → 1.0.7

package/tests/component/hub-integration.test.js

@@ -1,52 +1,54 @@
 'use strict';
 
-// Mock all external dependencies before requiring the module
-jest.mock('@onlineapps/connector-mq-client', () => {
-  return jest.fn().mockImplementation(() => ({
+// Mock actual external dependencies used by conn-base-hub (component-level wiring, no real infra)
+jest.mock('@onlineapps/conn-infra-mq', () =>
+  jest.fn().mockImplementation(() => ({
     connect: jest.fn().mockResolvedValue(),
     publish: jest.fn().mockResolvedValue(),
     subscribe: jest.fn().mockResolvedValue(),
-    close: jest.fn().mockResolvedValue()
-  }));
-}, { virtual: true });
+    close: jest.fn().mockResolvedValue(),
+    disconnect: jest.fn().mockResolvedValue(),
+  }))
+);
 
-jest.mock('@onlineapps/connector-registry-client', () => ({
+jest.mock('@onlineapps/conn-orch-registry', () => ({
   ServiceRegistryClient: jest.fn().mockImplementation(() => ({
+    initialize: jest.fn().mockResolvedValue(true),
     register: jest.fn().mockResolvedValue(),
     deregister: jest.fn().mockResolvedValue(),
     discover: jest.fn().mockResolvedValue([]),
+    subscribeToChanges: jest.fn().mockResolvedValue(true),
+    startHeartbeat: jest.fn(),
+    dispose: jest.fn().mockResolvedValue(true),
     emit: jest.fn()
   }))
-}), { virtual: true });
+}));
 
-jest.mock('@onlineapps/connector-cookbook', () => ({
+jest.mock('@onlineapps/conn-orch-cookbook', () => ({
   validateCookbook: jest.fn(),
-  parseCookbook: jest.fn(),
+  parseCookbookFromObject: jest.fn(),
   executeCookbook: jest.fn()
-}), { virtual: true });
+}));
 
-jest.mock('@onlineapps/connector-storage', () => {
-  return jest.fn().mockImplementation(() => ({
+jest.mock('@onlineapps/conn-base-storage', () =>
+  jest.fn().mockImplementation(() => ({
+    initialize: jest.fn().mockResolvedValue(true),
     upload: jest.fn().mockResolvedValue({ etag: '123' }),
     download: jest.fn().mockResolvedValue(Buffer.from('test')),
     delete: jest.fn().mockResolvedValue(),
     list: jest.fn().mockResolvedValue([])
-  }));
-}, { virtual: true });
+  }))
+);
 
-jest.mock('@onlineapps/connector-logger', () => {
-  return jest.fn().mockImplementation((config) => ({
+jest.mock('@onlineapps/conn-base-monitoring', () => ({
+  init: jest.fn().mockResolvedValue({
     info: jest.fn(),
     error: jest.fn(),
     warn: jest.fn(),
     debug: jest.fn(),
-    api: { info: jest.fn(), error: jest.fn() },
-    mq: { info: jest.fn(), error: jest.fn() },
-    workflow: { info: jest.fn(), error: jest.fn() },
-    registry: { info: jest.fn(), error: jest.fn() },
-    close: jest.fn().mockResolvedValue()
-  }));
-}, { virtual: true });
+    shutdown: jest.fn().mockResolvedValue(true),
+  })
+}));
 
 describe('Hub Connector Component Tests @component', () => {
   let hub;
@@ -97,7 +99,7 @@ describe('Hub Connector Component Tests @component', () => {
 
     it('should export cookbook functions', () => {
       expect(hub.validateCookbook).toBeDefined();
-      expect(hub.parseCookbook).toBeDefined();
+      expect(hub.parseCookbookFromObject).toBeDefined();
       expect(hub.executeCookbook).toBeDefined();
     });
   });
@@ -271,19 +273,19 @@ describe('Hub Connector Component Tests @component', () => {
   describe('Cookbook Integration', () => {
     it('should provide cookbook functions', () => {
       expect(hub.validateCookbook).toBeDefined();
-      expect(hub.parseCookbook).toBeDefined();
+      expect(hub.parseCookbookFromObject).toBeDefined();
       expect(hub.executeCookbook).toBeDefined();
     });
 
     it('should handle cookbook operations', () => {
       const cookbook = {
-        version: '1.0',
+        version: '2.1.0',
         name: 'test-cookbook',
         steps: []
       };
 
       expect(() => hub.validateCookbook(cookbook)).not.toThrow();
-      expect(() => hub.parseCookbook('yaml content')).not.toThrow();
+      expect(() => hub.parseCookbookFromObject(cookbook)).not.toThrow();
       expect(() => hub.executeCookbook(cookbook, {})).not.toThrow();
     });
   });

package/tests/unit/hub.test.js

@@ -2,50 +2,54 @@
  * Tests for @onlineapps/connector-hub
  */
 
-const ConnectorHub = require('../../src/index');
-
-// Mock all dependencies
-jest.mock('@onlineapps/connector-registry-client', () => ({
+// Mock actual dependencies used by conn-base-hub
+jest.mock('@onlineapps/conn-orch-registry', () => ({
   ServiceRegistryClient: jest.fn().mockImplementation(() => ({
     initialize: jest.fn().mockResolvedValue(true),
     dispose: jest.fn().mockResolvedValue(true),
-    registerService: jest.fn().mockResolvedValue(true),
-    deregisterService: jest.fn().mockResolvedValue(true),
+    register: jest.fn().mockResolvedValue(true),
+    deregister: jest.fn().mockResolvedValue(true),
     startHeartbeat: jest.fn(),
     subscribeToChanges: jest.fn().mockResolvedValue(true)
   }))
-}), { virtual: true });
-
-jest.mock('@onlineapps/connector-mq-client', () => jest.fn().mockImplementation(() => ({
-  connect: jest.fn().mockResolvedValue(true),
-  disconnect: jest.fn().mockResolvedValue(true),
-  publish: jest.fn().mockResolvedValue(true),
-  consume: jest.fn().mockResolvedValue(true)
-})), { virtual: true });
-
-jest.mock('@onlineapps/connector-storage', () => jest.fn().mockImplementation(() => ({
-  initialize: jest.fn().mockResolvedValue(true),
-  uploadWithFingerprint: jest.fn().mockResolvedValue({ fingerprint: 'abc123' }),
-  downloadWithVerification: jest.fn().mockResolvedValue({ data: 'test' })
-})), { virtual: true });
-
-jest.mock('@onlineapps/connector-logger', () => jest.fn().mockImplementation((config) => ({
-  info: jest.fn(),
-  error: jest.fn(),
-  warn: jest.fn(),
-  debug: jest.fn(),
-  api: { info: jest.fn(), error: jest.fn() },
-  mq: { info: jest.fn(), error: jest.fn() },
-  workflow: { info: jest.fn(), error: jest.fn() },
-  registry: { info: jest.fn(), error: jest.fn() },
-  close: jest.fn().mockResolvedValue(true)
-})), { virtual: true });
-
-jest.mock('@onlineapps/connector-cookbook', () => ({
+}));
+
+jest.mock('@onlineapps/conn-infra-mq', () =>
+  jest.fn().mockImplementation(() => ({
+    connect: jest.fn().mockResolvedValue(true),
+    disconnect: jest.fn().mockResolvedValue(true),
+    publish: jest.fn().mockResolvedValue(true),
+    consume: jest.fn().mockResolvedValue(true),
+  }))
+);
+
+jest.mock('@onlineapps/conn-base-storage', () =>
+  jest.fn().mockImplementation(() => ({
+    initialize: jest.fn().mockResolvedValue(true),
+    upload: jest.fn().mockResolvedValue({ etag: 'abc123' }),
+    download: jest.fn().mockResolvedValue(Buffer.from('test')),
+    delete: jest.fn().mockResolvedValue(true),
+    list: jest.fn().mockResolvedValue([]),
+  }))
+);
+
+jest.mock('@onlineapps/conn-base-monitoring', () => ({
+  init: jest.fn().mockResolvedValue({
+    info: jest.fn(),
+    warn: jest.fn(),
+    error: jest.fn(),
+    debug: jest.fn(),
+    shutdown: jest.fn().mockResolvedValue(true),
+  })
+}));
+
+jest.mock('@onlineapps/conn-orch-cookbook', () => ({
   validateCookbook: jest.fn(),
-  parseCookbook: jest.fn(),
+  parseCookbookFromObject: jest.fn(),
   executeCookbook: jest.fn()
-}), { virtual: true });
+}));
+
+const ConnectorHub = require('../../src/index');
 
 describe('ConnectorHub @unit', () => {
   beforeEach(() => {
@@ -59,7 +63,7 @@ describe('ConnectorHub @unit', () => {
       expect(ConnectorHub.StorageConnector).toBeDefined();
       expect(ConnectorHub.createLogger).toBeDefined();
       expect(ConnectorHub.validateCookbook).toBeDefined();
-      expect(ConnectorHub.parseCookbook).toBeDefined();
+      expect(ConnectorHub.parseCookbookFromObject).toBeDefined();
       expect(ConnectorHub.executeCookbook).toBeDefined();
     });
 
@@ -83,7 +87,7 @@ describe('ConnectorHub @unit', () => {
           queue: 'test-queue'
         },
         storage: {
-          endpoint: 'localhost',
+          endPoint: 'localhost',
           port: 9000,
           accessKey: 'minioadmin',
           secretKey: 'minioadmin'
@@ -135,7 +139,7 @@ describe('ConnectorHub @unit', () => {
           queue: 'test-queue'
         },
         storage: {
-          endpoint: 'localhost',
+          endPoint: 'localhost',
           port: 9000,
           accessKey: 'minioadmin',
           secretKey: 'minioadmin'
@@ -163,7 +167,7 @@ describe('ConnectorHub @unit', () => {
           queue: 'test-queue'
         },
         storage: {
-          endpoint: 'localhost',
+          endPoint: 'localhost',
           port: 9000,
           accessKey: 'minioadmin',
           secretKey: 'minioadmin'
@@ -172,11 +176,13 @@ describe('ConnectorHub @unit', () => {
 
       const microservice = ConnectorHub.createMicroservice(config);
       await microservice.init();
+
+      const closeSpy = jest.spyOn(microservice.logger, 'close');
       await microservice.shutdown();
 
       expect(microservice.registry.dispose).toHaveBeenCalled();
       expect(microservice.mq.disconnect).toHaveBeenCalled();
-      expect(microservice.logger.close).toHaveBeenCalled();
+      expect(closeSpy).toHaveBeenCalled();
     });
 
     test('should handle initialization errors gracefully', async () => {