comq 0.17.0 → 0.18.0

package/test/io.diagnostics.test.js

@@ -28,7 +28,7 @@ describe.each(['request', 'reply', 'event'])('%s channel events',
    * @param {comq.topology.type} type
    */
   (type) => {
-    it.each(['flow', 'drain', 'recover', 'discard', 'pause', 'resume', 'lost', 'remove'])('should re-emit %s',
+    it.each(['flow', 'drain', 'recover', 'discard', 'retry', 'pause', 'resume', 'lost', 'remove'])('should re-emit %s',
       /**
        * @param {comq.diagnostics.Event} event
        */

package/test/presets.test.js

@@ -8,7 +8,8 @@ it('should define request preset', async () => {
     confirms: false,
     durable: true,
     acknowledgments: true,
-    persistent: false
+    persistent: false,
+    delay: [1000, 3000, 5000, 10000]
   })
 })
 
@@ -28,6 +29,7 @@ it('should define event preset', async () => {
     confirms: true,
     durable: true,
     acknowledgments: true,
-    persistent: true
+    persistent: true,
+    delay: [1000, 10000, 30000, 90000]
   })
 })

package/test/shards/channel.test.js

@@ -718,3 +718,36 @@ async function getCreatedChannels () {
 
   return await Promise.all(promises)
 }
+
+describe('routed', () => {
+  const exchange = generate()
+  const queue = generate()
+  const key = generate()
+  const buffer = randomBytes(8)
+  const consumer = jest.fn()
+
+  /** @type {jest.MockedObject<comq.Channel>[]} */
+  let channels
+
+  beforeEach(async () => {
+    channel = await create(connections, type)
+    channels = await getCreatedChannels()
+  })
+
+  it('should bind using all channels', async () => {
+    await channel.bound(exchange, queue, key, consumer)
+
+    for (const chan of channels) {
+      expect(chan.bound).toHaveBeenCalledWith(exchange, queue, key, consumer)
+    }
+  })
+
+  it('should route to a single channel', async () => {
+    await channel.route(exchange, key, buffer)
+
+    const used = channels.filter((chan) => chan.route.mock.calls.length > 0)
+
+    expect(used).toHaveLength(1)
+    expect(used[0].route).toHaveBeenCalledWith(exchange, key, buffer, undefined)
+  })
+})

package/test/singleton.test.js

@@ -27,7 +27,7 @@ beforeEach(() => {
 
 it('should extend Connection', async () => {
   expect(connection).toBeInstanceOf(mock.Connection)
-  expect(mock.Connection.ctor).toHaveBeenCalledWith(url)
+  expect(mock.Connection.ctor).toHaveBeenCalledWith(url, {})
 })
 
 describe('connection', () => {

package/types/connection.d.ts

@@ -22,7 +22,12 @@ declare namespace comq {
     forget(event: _diagnostics.Event, listener: Function): void
   }
 
-  type Connect = (...urls: string[]) => Promise<_io.IO>
+  type Connect = {
+    (...urls: string[]): Promise<_io.IO>
+
+    /** The trailing argument overrides the topology presets, per channel type. */
+    (...args: [...urls: string[], overrides: _topology.Overrides]): Promise<_io.IO>
+  }
 
 }
 

package/types/diagnostic.d.ts

@@ -1,7 +1,7 @@
 declare namespace comq.diagnostics {
 
   type Event = 'open' | 'close' | 'error' | 'reconnect' | 'exhausted' | 'flow' | 'drain' |
-    'remove' | 'lost' | 'recover' | 'discard' | 'pause' | 'resume' | 'return'
+    'remove' | 'lost' | 'recover' | 'discard' | 'retry' | 'pause' | 'resume' | 'return'
 
   interface Diagnosable {
     diagnose(event: Event, listener: Function): void

package/types/io.d.ts

@@ -103,7 +103,9 @@ declare namespace comq {
 
     diagnose(event: 'recover', listener: (channel: _topology.type, index?: number) => void): void
 
-    diagnose(event: 'discard', listener: (channel: _topology.type, message: any, index?: number) => void): void
+    diagnose(event: 'discard', listener: (channel: _topology.type, message: any, error: Error, index?: number) => void): void
+
+    diagnose(event: 'retry', listener: (channel: _topology.type, message: any, error: Error, attempt: number, index?: number) => void): void
 
     diagnose(event: 'pause', listener: (channel: _topology.type) => void): void
 

package/types/topology.d.ts

@@ -8,6 +8,11 @@ declare namespace comq {
       [K in type]: Topology
     }
 
+    /** Per channel type overrides of the presets, as passed to `connect`. */
+    type Overrides = {
+      [K in type]?: Partial<Topology>
+    }
+
   }
 
   type Topology = {
@@ -16,8 +21,19 @@ declare namespace comq {
     durable: boolean
     acknowledgments: boolean
     persistent: boolean
+
+    /**
+     * How long a failed message waits before it is delivered again, in milliseconds:
+     * one entry per retry, so **the length of the ladder is the number of retries** and
+     * four rungs is five attempts. A bare number is a ladder of one, hence a single retry.
+     *
+     * Each distinct value is a retry queue of its own, because the wait is the queue's
+     * `x-message-ttl` rather than the message's, and a queue holds one of those.
+     */
+    delay: number | number[]
   }
 
 }
 
 export type type = comq.topology.type
+export type Overrides = comq.topology.Overrides