comq 0.26.0 → 0.27.0

package/features/shards.virtual.feature

@@ -8,11 +8,6 @@ Feature: Virtual shards
     When I connect to the names
     Then 1 connection is open to each broker
 
-  Scenario: Names given as a range
-    Given 4 names, half of them standing for each broker
-    When I connect to the range of the names
-    Then 1 connection is open to each broker
-
   Scenario: Requests over the names of one broker
     Given 4 names standing for the first broker
     And an active connection to the names

package/features/steps/names.js

@@ -58,16 +58,6 @@ Given('an active connection to the names', connectNames)
 
 When('I connect to the names', connectNames)
 
-When('I connect to the range of the names',
-  /**
-   * @this {comq.features.Context}
-   */
-  async function () {
-    const amount = Object.keys(this.names).length
-
-    await this.connectNames([name(`[0..${amount}]`)], PORT)
-  })
-
 When('half of the names move to the {broker} broker',
   /**
    * @param {number} n

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "comq",
-  "version": "0.26.0",
+  "version": "0.27.0",
   "description": "ComQ",
   "author": {
     "name": "Artem Gurtovoi",

package/readme.md

@@ -522,15 +522,6 @@ addresses are two connections.
 const io = await connect('amqp://rmq0.example.com', 'amqp://rmq1.example.com', /* ... */)
 ```
 
-A range in a host is as many URLs. Its end is exclusive, so a range that starts at zero names as
-many hosts as its end says, and a start written with leading zeros pads every number to its
-width:
-
-```javascript
-await connect('amqp://developer:secret@rmq[0..32].example.com') // rmq0 … rmq31
-await connect('amqp://developer:secret@rmq[00..32].example.com') // rmq00 … rmq31
-```
-
 This is what lets the number of brokers change without anyone being reconfigured: the names stay,
 and what they resolve to moves.
 
@@ -592,9 +583,6 @@ and says nothing of records being updated one by one. A name that is not found i
 from the hosts file, or one completed by the resolver's search list) has no TTL, and makes them
 60 seconds.
 
-A single URL is one connection made by its name, as it always was, and nothing here applies to
-it.
-
 ## Singleton connection
 
 `async assert(url: string): IO`

package/source/connect.js

@@ -28,7 +28,7 @@ const split = (args) => {
   const urls = /** @type {string[]} */ (typeof last === 'object' ? args.slice(0, -1) : args)
   const { resolution, ...overrides } = /** @type {comq.Options} */ (typeof last === 'object' ? last : {})
 
-  return [urls.flatMap(shards.expand), overrides, resolution]
+  return [urls, overrides, resolution]
 }
 
 /**

package/source/shards/index.js

@@ -1,7 +1,5 @@
 'use strict'
 
 const { Connection } = require('./connection')
-const { expand } = require('./expand')
 
 exports.Connection = Connection
-exports.expand = expand

package/test/connect.test.js

@@ -77,23 +77,6 @@ describe('sharded connection', () => {
   })
 })
 
-describe('ranges', () => {
-  it('should expand a range into the urls of a sharded connection', async () => {
-    await connect('amqp://rmq[0..3].example.com')
-
-    const expanded = ['amqp://rmq0.example.com', 'amqp://rmq1.example.com', 'amqp://rmq2.example.com']
-
-    expect(shards.Connection).toHaveBeenCalledWith(expanded, expect.any(Function), undefined)
-  })
-
-  it('should connect to a range of one as to a single url', async () => {
-    await connect('amqp://rmq[0..1].example.com')
-
-    expect(Connection).toHaveBeenCalledWith('amqp://rmq0.example.com', {})
-    expect(shards.Connection).not.toHaveBeenCalled()
-  })
-})
-
 describe('resolution', () => {
   it('should pass how the names are followed, apart from the overrides', async () => {
     const urls = [generate(), generate()]

package/types/connection.d.ts

@@ -30,7 +30,6 @@ declare namespace comq {
 
   type Connect = {
     /**
-     * A range in a host is as many URLs: `amqp://rmq[0..32].example.com` is `rmq0` to `rmq31`.
      * Several URLs are the names of the shards, and a connection is made to each broker they
      * stand for.
      */

package/source/shards/expand.js

@@ -1,57 +0,0 @@
-'use strict'
-
-/**
- * Expands the ranges in the host of a URL into a URL per number: `amqp://rmq[0..3].example.com`
- * is `rmq0`, `rmq1` and `rmq2`. The end is exclusive, so a range starting at zero names as many
- * hosts as its end says. A start written with leading zeros pads every number to its width.
- *
- * Only the host is looked at: credentials, a path and a query are free to contain anything, and
- * an IPv6 literal, which is bracketed as well, has no `..` in it.
- *
- * @param {string} url
- * @return {string[]}
- */
-function expand (url) {
-  const parts = url.match(AUTHORITY)
-
-  if (parts === null) return [url]
-
-  const [, head, host, tail] = parts
-
-  return hosts(host).map((host) => head + host + tail)
-}
-
-/**
- * @param {string} host
- * @return {string[]}
- */
-function hosts (host) {
-  const range = host.match(RANGE)
-
-  if (range === null) return [host]
-
-  const [expression, from, to] = range
-  const start = Number(from)
-  const end = Number(to)
-
-  if (end <= start) throw new RangeError(`Range ${expression} names no hosts: its end is exclusive`)
-
-  const width = from.length > 1 && from.startsWith('0') ? from.length : 0
-  const before = host.slice(0, range.index)
-  const after = host.slice(range.index + expression.length)
-  const expanded = []
-
-  for (let n = start; n < end; n++) {
-    // whatever follows may hold a range of its own
-    for (const rest of hosts(after)) expanded.push(before + String(n).padStart(width, '0') + rest)
-  }
-
-  return expanded
-}
-
-/** What precedes the host, the host with its port, and what follows. */
-const AUTHORITY = /^([a-z][a-z0-9+.-]*:\/\/(?:[^@/?#]*@)?)([^/?#]*)(.*)$/i
-
-const RANGE = /\[(\d+)\.\.(\d+)]/
-
-exports.expand = expand

package/test/shards/expand.test.js

@@ -1,58 +0,0 @@
-'use strict'
-
-const { expand } = require('../../source/shards/expand')
-
-it('should leave a url without a range as it is', async () => {
-  expect(expand('amqp://user:secret@rmq.example.com:5672/vhost?heartbeat=5'))
-    .toStrictEqual(['amqp://user:secret@rmq.example.com:5672/vhost?heartbeat=5'])
-})
-
-it('should expand a range, its end being exclusive', async () => {
-  expect(expand('amqp://rmq[0..3].example.com')).toStrictEqual([
-    'amqp://rmq0.example.com',
-    'amqp://rmq1.example.com',
-    'amqp://rmq2.example.com'
-  ])
-})
-
-it('should name as many hosts as the end of a range that starts at zero', async () => {
-  expect(expand('amqp://rmq[0..32].example.com')).toHaveLength(32)
-})
-
-it('should keep what surrounds the host', async () => {
-  expect(expand('amqps://user:secret@rmq-[1..3].example.com:5671/vhost?heartbeat=5')).toStrictEqual([
-    'amqps://user:secret@rmq-1.example.com:5671/vhost?heartbeat=5',
-    'amqps://user:secret@rmq-2.example.com:5671/vhost?heartbeat=5'
-  ])
-})
-
-it('should pad to the width the start is written with', async () => {
-  expect(expand('amqp://rmq[08..11]')).toStrictEqual(['amqp://rmq08', 'amqp://rmq09', 'amqp://rmq10'])
-})
-
-it('should expand every range', async () => {
-  expect(expand('amqp://rmq[0..2].zone[0..2]')).toStrictEqual([
-    'amqp://rmq0.zone0',
-    'amqp://rmq0.zone1',
-    'amqp://rmq1.zone0',
-    'amqp://rmq1.zone1'
-  ])
-})
-
-it('should leave an IPv6 literal alone', async () => {
-  expect(expand('amqp://[::1]:5672')).toStrictEqual(['amqp://[::1]:5672'])
-})
-
-it('should look at the host only', async () => {
-  const url = 'amqp://user:[0..2]@rmq.example.com/[0..2]?name=[0..2]'
-
-  expect(expand(url)).toStrictEqual([url])
-})
-
-it('should leave what is not a url as it is', async () => {
-  expect(expand('whatever')).toStrictEqual(['whatever'])
-})
-
-it.each(['[3..3]', '[3..1]'])('should refuse a range that names no hosts: %s', async (range) => {
-  expect(() => expand(`amqp://rmq${range}`)).toThrow(RangeError)
-})