@toa.io/core 0.2.1-dev.2 → 0.2.1-dev.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/core",
-  "version": "0.2.1-dev.2",
+  "version": "0.2.1-dev.4",
   "description": "Toa Core",
   "author": "temich <tema.gurtovoy@gmail.com>",
   "homepage": "https://github.com/toa-io/toa#readme",

package/src/component.js

@@ -21,11 +21,11 @@ class Component extends Connector {
     Object.values(operations).forEach((operation) => this.depends(operation))
   }
 
-  async connection () {
+  async open () {
     console.info(`Runtime '${this.locator.id}' connected`)
   }
 
-  disconnected () {
+  async dispose () {
     console.info(`Runtime '${this.locator.id}' disconnected`)
   }
 

package/src/composition.js

@@ -13,11 +13,11 @@ class Composition extends Connector {
     if (tenants.length > 0) this.depends(tenants)
   }
 
-  async connection () {
+  async open () {
     console.info('Composition complete')
   }
 
-  async disconnected () {
+  async dispose () {
     console.info('Composition shutdown complete')
   }
 }

package/src/connector.js

@@ -3,7 +3,6 @@
 const { console } = require('@toa.io/console')
 const { newid } = require('@toa.io/generic')
 
-// noinspection JSClosureCompilerSyntax
 /**
  * Abstract connections hierarchy
  * @implements {toa.core.Connector}
@@ -11,10 +10,13 @@ const { newid } = require('@toa.io/generic')
 class Connector {
   /** @type {Array<Connector>} */
   #dependencies = []
+
   /** @type {Array<Connector>} */
   #links = []
+
   /** @type {Promise} */
   #connecting
+
   /** @type {Promise} */
   #disconnecting
 
@@ -88,7 +90,7 @@ class Connector {
 
     this.#connecting = (async () => {
       await Promise.all(this.#dependencies.map((connector) => connector.connect()))
-      await this.connection()
+      await this.open()
     })()
 
     try {
@@ -133,13 +135,13 @@ class Connector {
         if (delay > DELAY) console.warn(`Connector ${this.id} still disconnecting (${delay})`)
       }, DELAY)
 
-      if (interrupt !== true) await this.disconnection()
+      if (interrupt !== true) await this.close()
 
       clearInterval(interval)
 
       await Promise.all(this.#dependencies.map(connector => connector.disconnect()))
 
-      this.disconnected()
+      await this.dispose()
     })()
 
     await this.#disconnecting
@@ -162,24 +164,18 @@ class Connector {
 
   /**
    * Called on connection
-   *
-   * @returns {Promise<void>}
    */
-  async connection () {}
+  async open () {}
 
   /**
    * Called on disconnection
-   *
-   * @returns {Promise<void>}
    */
-  async disconnection () {}
+  async close () {}
 
   /**
    * Called after self and dependants disconnection is complete
-   *
-   * @returns {void}
    */
-  disconnected () {}
+  async dispose () {}
 }
 
 const DELAY = 5000

package/src/discovery.js

@@ -13,7 +13,7 @@ class Discovery extends Connector {
     this.#lookup = lookup
   }
 
-  async connection () {
+  async open () {
     this.#lookups = {}
   }
 

package/src/reflection.js

@@ -20,7 +20,7 @@ class Reflection extends Connector {
     this.#source = source
   }
 
-  async connection () {
+  async open () {
     this.value = await this.#source()
   }
 }

package/src/remote.js

@@ -5,11 +5,11 @@ const { console } = require('@toa.io/console')
 const { Component } = require('./component')
 
 class Remote extends Component {
-  async connection () {
+  async open () {
     console.info(`Remote '${this.locator.id}' connected`)
   }
 
-  async disconnected () {
+  async dispose () {
     console.info(`Remote '${this.locator.id}' disconnected`)
   }
 }

package/test/connector.fixtures.js

@@ -14,23 +14,23 @@ class TestConnector extends Connector {
     this.#label = label
   }
 
-  async connection () {
+  async open () {
     await timeout(random(10))
     this.#seq.push(`+${this.#label}`)
   }
 
-  async disconnection () {
+  async close () {
     await timeout(random(10))
     this.#seq.push(`-${this.#label}`)
   }
 
-  disconnected () {
+  async dispose () {
     this.#seq.push(`*${this.#label}`)
   }
 }
 
 class FailingConnector extends Connector {
-  async connection () {
+  async open () {
     await timeout(random(10))
     throw new Error('FailingConnector')
   }

package/test/emission.test.js

@@ -16,7 +16,7 @@ beforeEach(async () => {
   emission = new Emission(fixtures.events)
   event = clone(fixtures.event)
 
-  await emission.connection()
+  await emission.open()
 })
 
 it('should depend on events', () => {

package/types/bindings.d.ts

@@ -14,8 +14,8 @@ declare namespace toa.core.bindings {
     emit(message: _core.Message): Promise<void>
   }
 
-  interface Broadcaster extends _core.Connector {
-    send(label: string, payload: Object): Promise<void>
+  interface Broadcast extends _core.Connector {
+    transmit(label: string, payload: object): Promise<void>
 
     receive(label: string, callback: (payload: object) => Promise<void>): Promise<void>
   }
@@ -27,9 +27,9 @@ declare namespace toa.core.bindings {
 
     emitter?(locator: _core.Locator, label: string): Emitter
 
-    receiver?(locator: _core.Locator, label: string, id: string, receiver: _core.Receiver): _core.Connector
+    receiver?(locator: _core.Locator, label: string, group: string, receiver: _core.Receiver): _core.Connector
 
-    broadcaster?(name: string, group?: string): Broadcaster
+    broadcast?(name: string, group?: string): Broadcast
   }
 
 }

package/types/connector.d.ts

@@ -12,9 +12,11 @@ declare namespace toa.core {
 
     disconnect(interrupt?: boolean): Promise<void>
 
-    connection(): Promise<void>
+    open(): Promise<void>
 
-    disconnection(): Promise<void>
+    close(): Promise<void>
+
+    dispose(): Promise<void>
   }
 
 }