@toa.io/bindings.amqp 0.4.0-dev.0 → 0.4.0-dev.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/bindings.amqp",
-  "version": "0.4.0-dev.0",
+  "version": "0.4.0-dev.6",
   "description": "Toa AMQP Binding",
   "author": "temich <tema.gurtovoy@gmail.com>",
   "homepage": "https://github.com/toa-io/toa#readme",
@@ -19,15 +19,14 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "devDependencies": {
-    "@toa.io/mock": "0.4.0-dev.0",
-    "@types/amqplib": "0.8.2"
+    "@toa.io/mock": "0.4.0-dev.6"
   },
   "dependencies": {
-    "@toa.io/console": "0.4.0-dev.0",
-    "@toa.io/core": "0.4.0-dev.0",
-    "@toa.io/generic": "0.4.0-dev.0",
-    "@toa.io/pointer": "0.4.0-dev.0",
-    "comq": "0.4.0-dev.0"
+    "@toa.io/console": "0.4.0-dev.6",
+    "@toa.io/core": "0.4.0-dev.6",
+    "@toa.io/generic": "0.4.0-dev.6",
+    "@toa.io/generics.amqp": "0.4.0-dev.6",
+    "@toa.io/pointer": "0.4.0-dev.6"
   },
   "gitHead": "2be07592325b2e4dc823e81d882a4e50bf50de24"
 }

package/source/broadcast.js

@@ -1,7 +1,6 @@
 'use strict'
 
 const { Connector } = require('@toa.io/core')
-const { newid } = require('@toa.io/generic')
 
 const { name } = require('./queues')
 
@@ -28,7 +27,7 @@ class Broadcast extends Connector {
 
     this.#comm = comm
     this.#locator = locator
-    this.#group = group ?? newid()
+    this.#group = group
 
     this.depends(comm)
   }

package/source/factory.js

@@ -1,16 +1,15 @@
 'use strict'
 
 const { Locator } = require('@toa.io/core')
+const { connector } = require('@toa.io/generics.amqp')
 
-const { Pointer } = require('./pointer')
-const { Communication } = require('./communication')
 const { Producer } = require('./producer')
 const { Consumer } = require('./consumer')
 const { Emitter } = require('./emitter')
 const { Receiver } = require('./receiver')
 const { Broadcast } = require('./broadcast')
 
-const { SYSTEM } = require('./constants')
+const { SYSTEM, PREFIX } = require('./constants')
 
 /**
  * @implements {toa.core.bindings.Factory}
@@ -28,16 +27,28 @@ class Factory {
     return new Consumer(comm, locator, endpoint)
   }
 
+  /**
+   * @param {toa.core.Locator} locator
+   * @param {string} label
+   * @return {Emitter}
+   */
   emitter (locator, label) {
     const comm = this.#getCommunication(locator)
 
     return new Emitter(comm, locator, label)
   }
 
-  receiver (locator, label, group, receiver) {
-    const comm = this.#getCommunication(locator)
+  /**
+   * @param {toa.core.Locator} source
+   * @param {string} label
+   * @param {string} group
+   * @param {toa.core.Receiver} receiver
+   * @return {Receiver}
+   */
+  receiver (source, label, group, receiver) {
+    const comm = this.#getCommunication(source)
 
-    return new Receiver(comm, locator, label, group, receiver)
+    return new Receiver(comm, label, group, receiver)
   }
 
   broadcast (name, group) {
@@ -49,13 +60,11 @@ class Factory {
 
   /**
    *
-   * @param {toa.core.Locator} locator
+   * @param {toa.core.Locator} source
    * @return {toa.amqp.Communication}
    */
-  #getCommunication (locator) {
-    const pointer = /** @type {toa.pointer.Pointer} */ new Pointer(locator)
-
-    return new Communication(pointer)
+  #getCommunication (source) {
+    return connector(PREFIX, source)
   }
 }
 

package/source/receiver.js

@@ -1,7 +1,6 @@
 'use strict'
 
 const { Connector } = require('@toa.io/core')
-const { name } = require('./queues')
 
 class Receiver extends Connector {
   /** @type {string} */
@@ -18,15 +17,14 @@ class Receiver extends Connector {
 
   /**
    * @param {toa.amqp.Communication} comm
-   * @param {toa.core.Locator} locator
-   * @param {string} label
+   * @param {string} exchange
    * @param {string} group
    * @param {toa.core.Receiver} receiver
    */
-  constructor (comm, locator, label, group, receiver) {
+  constructor (comm, exchange, group, receiver) {
     super()
 
-    this.#exchange = name(locator, label)
+    this.#exchange = exchange
     this.#group = group
     this.#comm = comm
     this.#receiver = receiver

package/test/broadcast.test.js

@@ -67,7 +67,7 @@ it('should receive', async () => {
   expect(comm.consume).toHaveBeenCalledWith(exchange, group, expect.any(Function))
 })
 
-it('should create unique group if not provided', async () => {
+it('should consume exclusively if group is not provided', async () => {
   jest.clearAllMocks()
 
   broadcast = new Broadcast(comm, locator)
@@ -79,5 +79,5 @@ it('should create unique group if not provided', async () => {
 
   const group = comm.consume.mock.calls[0][1]
 
-  expect(group).toBeDefined()
+  expect(group).toBeUndefined()
 })

package/test/factory.test.js

@@ -5,8 +5,7 @@
 const { generate } = require('randomstring')
 const { Locator } = require('@toa.io/core')
 
-jest.mock('../source/pointer')
-jest.mock('../source/communication')
+jest.mock('@toa.io/generics.amqp')
 jest.mock('../source/producer')
 jest.mock('../source/consumer')
 jest.mock('../source/emitter')
@@ -14,14 +13,9 @@ jest.mock('../source/receiver')
 jest.mock('../source/broadcast')
 
 const {
-  /** @type {jest.MockedClass<Communication>} */
-  Communication
-} = require('../source/communication')
-
-const {
-  /** @type {jest.MockedClass<Pointer>} */
-  Pointer
-} = require('../source/pointer')
+  /** @type {jest.MockedFunction<connector>} */
+  connector
+} = require('@toa.io/generics.amqp')
 
 const {
   /** @type {jest.MockedClass<Producer>} */
@@ -66,6 +60,7 @@ beforeEach(() => {
 const locator = /** @type {toa.core.Locator} */ { name: generate(), namespace: generate() }
 const endpoints = [generate(), generate()]
 const endpoint = generate()
+const label = locator.id + '.' + endpoint
 const name = generate()
 const group = generate()
 const component = /** @type {toa.core.Component} */ {}
@@ -121,22 +116,16 @@ describe.each(['Producer', 'Consumer', 'Emitter', 'Receiver', 'Broadcast'])('%s
   })
 
   if (method !== 'broadcast') {
-    it('should create Pointer', async () => {
-      expect(Pointer).toHaveBeenCalledWith(locator)
+    it('should create Communication', async () => {
+      expect(connector).toHaveBeenCalledWith('bindings-amqp', locator)
     })
   }
-
-  it('should create Communication', async () => {
-    const pointer = Pointer.mock.instances[0]
-
-    expect(Communication).toHaveBeenCalledWith(pointer)
-  })
 })
 
 describe('Producer', () => {
   beforeEach(() => {
     producer = factory.producer(locator, endpoints, component)
-    comm = Communication.mock.instances[0]
+    comm = connector.mock.results[0].value
   })
 
   it('should create instance', async () => {
@@ -148,7 +137,7 @@ describe('Producer', () => {
 describe('Consumer', () => {
   beforeEach(() => {
     consumer = factory.consumer(locator, endpoint)
-    comm = Communication.mock.instances[0]
+    comm = connector.mock.results[0].value
   })
 
   it('should create instance', async () => {
@@ -160,7 +149,7 @@ describe('Consumer', () => {
 describe('Emitter', () => {
   beforeEach(() => {
     emitter = factory.emitter(locator, endpoint)
-    comm = Communication.mock.instances[0]
+    comm = connector.mock.results[0].value
   })
 
   it('should create instance', async () => {
@@ -171,12 +160,12 @@ describe('Emitter', () => {
 
 describe('Receiver', () => {
   beforeEach(() => {
-    receiver = factory.receiver(locator, endpoint, group, processor)
-    comm = Communication.mock.instances[0]
+    receiver = factory.receiver(locator, label, group, processor)
+    comm = connector.mock.results[0].value
   })
 
   it('should create instance', async () => {
-    expect(Receiver).toHaveBeenCalledWith(comm, locator, endpoint, group, processor)
+    expect(Receiver).toHaveBeenCalledWith(comm, label, group, processor)
     expect(receiver).toStrictEqual(Receiver.mock.instances[0])
   })
 })
@@ -184,7 +173,7 @@ describe('Receiver', () => {
 describe('Broadcast', () => {
   beforeEach(() => {
     broadcast = factory.broadcast(name, group)
-    comm = Communication.mock.instances[0]
+    comm = connector.mock.results[0].value
   })
 
   it('should create Locator', async () => {

package/test/receiver.test.js

@@ -19,9 +19,8 @@ it('should be', async () => {
 /** @type {jest.MockedObject<toa.amqp.Communication>} */
 const comm = mock.communication()
 
-const locator = /** @type {toa.core.Locator} */ { name: generate(), namespace: generate() }
+const exchange = generate()
 const group = generate()
-const label = generate()
 
 const processor = /** @type {jest.MockedObject<toa.core.Receiver>} */ {
   connect: jest.fn(async () => undefined),
@@ -35,7 +34,7 @@ let receiver
 beforeEach(() => {
   jest.clearAllMocks()
 
-  receiver = new Receiver(comm, locator, label, group, processor)
+  receiver = new Receiver(comm, exchange, group, processor)
 })
 
 it('should be instance of Connector', async () => {
@@ -49,10 +48,6 @@ it('should depend on communication', async () => {
 it('should consume events', async () => {
   await receiver.open()
 
-  expect(mock.queues.name).toHaveBeenCalledWith(locator, label)
-
-  const exchange = mock.queues.name.mock.results[0].value
-
   expect(comm.consume).toHaveBeenCalledWith(exchange, group, expect.any(Function))
 
   const callback = comm.consume.mock.calls[0][2]

package/source/communication.js

@@ -1,54 +0,0 @@
-'use strict'
-
-const { connect } = require('comq')
-const { Connector } = require('@toa.io/core')
-
-/**
- * @implements {toa.amqp.Communication}
- */
-class Communication extends Connector {
-  /** @type {toa.pointer.Pointer} */
-  #pointer
-
-  /** @type {comq.IO} */
-  #io
-
-  /**
-   * @param {toa.pointer.Pointer} pointer
-   */
-  constructor (pointer) {
-    super()
-
-    this.#pointer = pointer
-  }
-
-  async open () {
-    this.#io = await connect(this.#pointer.reference)
-  }
-
-  async close () {
-    await this.#io.seal()
-  }
-
-  async dispose () {
-    await this.#io.close()
-  }
-
-  async reply (queue, process) {
-    await this.#io.reply(queue, process)
-  }
-
-  async request (queue, request) {
-    return this.#io.request(queue, request)
-  }
-
-  async emit (exchange, message) {
-    await this.#io.emit(exchange, message)
-  }
-
-  async consume (exchange, group, consumer) {
-    await this.#io.consume(exchange, group, consumer)
-  }
-}
-
-exports.Communication = Communication

package/test/communication.test.js

@@ -1,97 +0,0 @@
-'use strict'
-
-const { generate } = require('randomstring')
-const { Connector } = require('@toa.io/core')
-const mock = require('./comq.mock')
-
-jest.mock('comq', () => mock.comq)
-
-const { Communication } = require('../source/communication')
-
-it('should be', async () => {
-  expect(Communication).toBeDefined()
-})
-
-/** @type {toa.pointer.Pointer} */
-let pointer
-
-/** @type {toa.amqp.Communication} */
-let comm
-
-beforeEach(() => {
-  jest.clearAllMocks()
-
-  pointer = /** @type {toa.pointer.Pointer} */ { reference: generate() }
-  comm = new Communication(pointer)
-})
-
-it('should be instance of Connector', async () => {
-  expect(comm).toBeInstanceOf(Connector)
-})
-
-it('should connect to a given pointer reference', async () => {
-  await comm.open()
-
-  expect(mock.comq.connect).toHaveBeenCalledWith(pointer.reference)
-})
-
-describe('connected', () => {
-  /** @type {jest.MockedObject<comq.IO>} */
-  let io
-
-  beforeEach(async () => {
-    await comm.open()
-
-    io = await mock.comq.connect.mock.results[0].value
-  })
-
-  it('should close', async () => {
-    await comm.close()
-
-    expect(io.seal).toHaveBeenCalled()
-  })
-
-  it('should dispose', async () => {
-    await comm.dispose()
-
-    expect(io.close).toHaveBeenCalled()
-  })
-
-  it('should bind reply', async () => {
-    const queue = generate()
-    const producer = jest.fn(async () => undefined)
-
-    await comm.reply(queue, producer)
-
-    expect(io.reply).toHaveBeenCalledWith(queue, producer)
-  })
-
-  it('should send request', async () => {
-    const queue = generate()
-    const request = generate()
-
-    const reply = await comm.request(queue, request)
-
-    expect(io.request).toHaveBeenCalledWith(queue, request)
-    expect(reply).toStrictEqual(await io.request.mock.results[0].value)
-  })
-
-  it('should emit', async () => {
-    const exchange = generate()
-    const message = generate()
-
-    await comm.emit(exchange, message)
-
-    expect(io.emit).toHaveBeenCalledWith(exchange, message)
-  })
-
-  it('should consume', async () => {
-    const exchange = generate()
-    const group = generate()
-    const consumer = jest.fn(async () => undefined)
-
-    await comm.consume(exchange, group, consumer)
-
-    expect(io.consume).toHaveBeenCalledWith(exchange, group, consumer)
-  })
-})

package/test/comq.mock.js

@@ -1,21 +0,0 @@
-'use strict'
-
-const { generate } = require('randomstring')
-
-/**
- * @return {jest.MockedObject<comq.IO>}
- */
-const io = () => (/** @type {jest.MockedObject<comq.IO>} */ {
-  request: jest.fn(async () => generate()),
-  reply: jest.fn(async () => undefined),
-  emit: jest.fn(async () => undefined),
-  consume: jest.fn(async () => undefined),
-  seal: jest.fn(async () => undefined),
-  close: jest.fn(async () => undefined)
-})
-
-const comq = {
-  connect: jest.fn(async () => io())
-}
-
-exports.comq = comq

package/types/communication.d.ts

@@ -1,16 +0,0 @@
-import { Connector } from '@toa.io/core/types'
-import * as comq from 'comq'
-
-declare namespace toa.amqp {
-
-  interface Communication extends Connector {
-    request(queue: string, request: any): Promise<any>
-
-    reply(queue: string, process: comq.producer): Promise<void>
-
-    emit(exchange: string, message: any): Promise<void>
-
-    consume(exchange: string, group: string, callback: comq.consumer): Promise<void>
-  }
-
-}