@superhero/eventflow-hub 4.0.3 → 4.0.5

package/README.md

@@ -58,20 +58,20 @@ tests 14
 suites 5
 pass 14
 
--------------------------------------------------------------------------------------------------------------------------
-file                    | line % | branch % | funcs % | uncovered lines
--------------------------------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------
+file                    | line % | branch % | funcs % | uncovered line
+-------------------------------------------------------------------------------------------------------------
 config.js               | 100.00 |   100.00 |  100.00 | 
-index.js                |  73.36 |    74.42 |   74.07 | 40-43 134-136 140-144 147-151 173-175 244-247 253-256 259-262 26…
+index.js                |  73.36 |    74.42 |   74.07 | 44-47 120-124 144-146 150-154 157-161 183-185 254-2…
 index.test.js           | 100.00 |   100.00 |  100.00 | 
 manager                 |        |          |         | 
  spokes.js              | 100.00 |   100.00 |  100.00 | 
  spokes.test.js         | 100.00 |   100.00 |  100.00 | 
  subscribers.js         |  78.21 |   100.00 |   83.33 | 61-77
  subscribers.test.js    | 100.00 |   100.00 |  100.00 | 
--------------------------------------------------------------------------------------------------------------------------
-all files               |  84.20 |    88.89 |   87.88 | 
--------------------------------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------
+all files               |  82.97 |    86.32 |   87.50 |
+-------------------------------------------------------------------------------------------------------------
 ```
 
 ## License

package/index.js

@@ -11,8 +11,8 @@ import { setInterval as asyncInterval } from 'node:timers/promises'
 export function locate(locator)
 {
   const
-    config = locator('@superhero/config').find('eventflow/hub', {}),
-    db     = locator('@superhero/eventflow-db'),
+    config = locator.config.find('eventflow/hub', {}),
+    db     = locator.locate('@superhero/eventflow-db'),
     hub    = new Hub(config, db)
 
   return hub
@@ -24,7 +24,11 @@ export function locate(locator)
 export default class Hub
 {
   #hubID
-  channel = new Channel()
+
+  abortion    = new AbortController()
+  channel     = new Channel()
+  spokes      = new SpokesManager()
+  subscribers = new SubscribersManager()
 
   get hubID()
   {
@@ -45,11 +49,8 @@ export default class Hub
     this.#hubID       = (new IdNameGenerator().generateId() + '.' + config.NAME).toUpperCase()
     this.config       = config
     this.db           = db
-    this.abortion     = new AbortController()
     this.log          = new Log({ label: `[${config.NAME}]` })
     this.certificates = new CertificatesManager(config.NAME, this.#hubID, config.certificates, db, this.log)
-    this.spokes       = new SpokesManager()
-    this.subscribers  = new SubscribersManager()
 
     this.channel.on('record', this.#onRecord.bind(this))
   }
@@ -63,11 +64,20 @@ export default class Hub
 
   async destroy()
   {
-    this.abortion.abort()
+    const reason = new Error('hub is destroyed')
+    reason.code  = 'E_EVENTFLOW_HUB_DESTROYED'
+
+    this.abortion.abort(reason)
     this.server?.close()
+
+    for(const socket of this.spokes.all)
+    {
+      socket.end()
+    }
+
     this.spokes.destroy()
     this.subscribers.destroy()
-    this.log.warn`hub has quit`
+    this.log.warn`destroyed`
     await this.db.updateHubToQuit(this.#hubID)
     setTimeout(() => this.db.close(), 500)
   }
@@ -269,7 +279,7 @@ export default class Hub
 
   async #attemptToConsumeAndBroadcastPublishedMessage(domain, id, name, pid)
   {
-    const consumed = await this.db.updateEventPublishedToConsumedByHub(domain, id, this.#hubID)
+    const consumed = await this.db.updateEventPublishedToConsumedByHub(id, this.#hubID)
 
     if(consumed)
     {

package/index.test.js

@@ -1,6 +1,5 @@
 import assert  from 'node:assert'
 import util    from 'node:util'
-import Config  from '@superhero/config'
 import Locator from '@superhero/locator'
 import Channel from '@superhero/tcp-record-channel'
 import { suite, test, beforeEach, afterEach } from 'node:test'
@@ -16,13 +15,11 @@ suite('@superhero/eventflow-hub', () =>
     if(beforeEach.skip) return
     locator = new Locator()
     locator.log.config.mute = true
-    const config = new Config()
-    await config.add('@superhero/eventflow-db')
-    await config.add('./config.js')
-    config.assign({ eventflow: { hub: { certificates: { CERT_PASS_ENCRYPTION_KEY: 'encryptionKey123' }}}})
-    locator.set('@superhero/config', config)
+    await locator.config.add('@superhero/eventflow-db')
+    await locator.config.add('./config.js')
+    locator.config.assign({ eventflow: { hub: { certificates: { CERT_PASS_ENCRYPTION_KEY: 'encryptionKey123' }}}})
     await locator.eagerload('@superhero/eventflow-db')
-    await locator.eagerload(config.find('locator'))
+    await locator.eagerload(locator.config.find('locator'))
     hub = locator('@superhero/eventflow-hub')
     hub.log.config.mute = true
     await hub.bootstrap()
@@ -78,14 +75,11 @@ suite('@superhero/eventflow-hub', () =>
                                                     && '50002'    === port 
                                                     && hub2.destroy().then(accept))
 
-        const 
-          locator2  = new Locator(),
-          config2   = new Config()
-
+        const locator2 = new Locator()
         locator2.log.config.mute = true
-        await config2.add('@superhero/eventflow-db')
-        await config2.add('./config.js')
-        config2.assign(
+        await locator2.config.add('@superhero/eventflow-db')
+        await locator2.config.add('./config.js')
+        locator2.config.assign(
         { eventflow:
           { hub:
             { INTERNAL_PORT:50002,
@@ -93,9 +87,8 @@ suite('@superhero/eventflow-hub', () =>
               certificates:
               { CERT_PASS_ENCRYPTION_KEY: 'encryptionKey123' }}}})
 
-        locator2.set('@superhero/config', config2)
         await locator2.eagerload('@superhero/eventflow-db')
-        await locator2.eagerload(config2.find('locator'))
+        await locator2.eagerload(locator2.config.find('locator'))
         const hub2 = locator2('@superhero/eventflow-hub')
         hub2.log.config.mute = true
         await hub2.bootstrap()

package/manager/spokes.js

@@ -8,10 +8,7 @@ export default class SpokesManager
 
   destroy()
   {
-    for(const socket of this.#set.values())
-    {
-      socket.end()
-    }
+    this.#set.clear()
   }
 
   add(socket)

package/manager/spokes.test.js

@@ -34,15 +34,14 @@ suite('@superhero/eventflow-hub/manager/spokes', () =>
   test('Destroy all sockets', async () =>
   {
     const manager = new SpokesManager()
-    const socket1 = { id: 'socket1', end: () => socket1.destroyed = true }
-    const socket2 = { id: 'socket2', end: () => socket2.destroyed = true }
+    const socket1 = { id: 'socket1' }
+    const socket2 = { id: 'socket2' }
 
     manager.add(socket1)
     manager.add(socket2)
     manager.destroy()
 
-    assert.strictEqual(socket1.destroyed, true)
-    assert.strictEqual(socket2.destroyed, true)
+    assert.strictEqual(manager.all.length, 0)
   })
 
   test('Handle deleting non-existent socket gracefully', async () =>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superhero/eventflow-hub",
-  "version": "4.0.3",
+  "version": "4.0.5",
   "description": "Eventflow hub is the central server component in the eventflow ecosystem.",
   "keywords": [
     "eventflow",
@@ -14,17 +14,15 @@
     "./manager/*": "./manager/*.js"
   },
   "dependencies": {
-    "@superhero/eventflow-db": "^4.1.2",
     "@superhero/id-name-generator": "^4.0.0",
     "@superhero/log": "^4.0.0",
-    "@superhero/eventflow-certificates": "^4.0.3",
+    "@superhero/eventflow-certificates": "^4.0.4",
     "@superhero/openssl": "^4.0.2",
     "@superhero/tcp-record-channel": "^4.2.1",
     "@superhero/deep": "^4.2.0"
   },
   "devDependencies": {
-    "@superhero/config": "^4.1.3",
-    "@superhero/locator": "^4.2.1"
+    "@superhero/locator": "^4.2.2"
   },
   "scripts": {
     "test-build": "npm explore @superhero/eventflow-db -- npm run test-build",