deps(dev): bump aegir from 38.1.8 to 40.0.0

package.json

@@ -166,6 +166,7 @@
     ]
   },
   "scripts": {
+    "clean": "aegir clean",
     "lint": "aegir lint",
     "dep-check": "aegir dep-check",
     "build": "aegir build",
@@ -188,7 +189,7 @@
   },
   "devDependencies": {
     "@types/ws": "^8.2.2",
-    "aegir": "^38.1.8",
+    "aegir": "^40.0.0",
     "delay": "^5.0.0",
     "it-all": "^3.0.1",
     "it-drain": "^3.0.1",

src/client.ts

@@ -1,10 +1,10 @@
 // load websocket library if we are not in the browser
-import WebSocket from './web-socket.js'
 import duplex from './duplex.js'
+import WebSocket from './web-socket.js'
 import wsurl from './ws-url.js'
-import type { ClientOptions } from 'ws'
 import type { DuplexWebSocket } from './duplex.js'
 import type { SinkOptions } from './sink.js'
+import type { ClientOptions } from 'ws'
 
 export interface WebSocketOptions extends SinkOptions {
   websocket?: ClientOptions

src/duplex.ts

@@ -1,7 +1,7 @@
-import source from './source.js'
 import sink from './sink.js'
-import type WebSocket from './web-socket.js'
+import source from './source.js'
 import type { SinkOptions } from './sink.js'
+import type WebSocket from './web-socket.js'
 import type { Duplex, Source } from 'it-stream-types'
 
 export interface DuplexWebSocket extends Duplex<AsyncGenerator<Uint8Array>, Source<Uint8Array>, Promise<void>> {

src/index.ts

@@ -1,4 +1,3 @@
-
 export { default as duplex } from './duplex.js'
 export { default as source } from './source.js'
 export { default as sink } from './sink.js'

src/server.ts

@@ -1,10 +1,10 @@
-import duplex, { DuplexWebSocket } from './duplex.js'
-import { WebSocketServer as WSServer } from 'ws'
+import { EventEmitter } from 'events'
 import http from 'http'
 import https from 'https'
-import { EventEmitter } from 'events'
-import type { VerifyClientCallbackSync, VerifyClientCallbackAsync, AddressInfo } from 'ws'
+import { WebSocketServer as WSServer } from 'ws'
+import duplex, { type DuplexWebSocket } from './duplex.js'
 import type WebSocket from './web-socket.js'
+import type { VerifyClientCallbackSync, VerifyClientCallbackAsync, AddressInfo } from 'ws'
 
 export interface ServerOptions {
   key?: string
@@ -37,7 +37,7 @@ class Server extends EventEmitter {
   }
 
   async listen (addrInfo: { port: number } | number): Promise<WebSocketServer> {
-    return await new Promise<WebSocketServer>((resolve, reject) => {
+    return new Promise<WebSocketServer>((resolve, reject) => {
       this.wsServer.once('error', (e) => { reject(e) })
       this.wsServer.once('listening', () => { resolve(this) })
       this.server.listen(typeof addrInfo === 'number' ? addrInfo : addrInfo.port)

src/sink.ts

@@ -1,6 +1,6 @@
 import ready from './ready.js'
-import type { WebSocket } from 'ws'
 import type { Sink, Source } from 'it-stream-types'
+import type { WebSocket } from 'ws'
 
 export interface SinkOptions {
   closeOnEnd?: boolean

src/source.ts

@@ -1,4 +1,3 @@
-
 import { EventIterator } from 'event-iterator'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import type { WebSocket, ErrorEvent, MessageEvent } from 'ws'

test/close-on-end.spec.ts

@@ -1,11 +1,11 @@
 import { expect } from 'aegir/chai'
-import WebSocket from '../src/web-socket.js'
 import drain from 'it-drain'
-import { pipe } from 'it-pipe'
 import each from 'it-foreach'
-import wsurl from './helpers/wsurl.js'
-import * as WS from '../src/index.js'
+import { pipe } from 'it-pipe'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
+import * as WS from '../src/index.js'
+import WebSocket from '../src/web-socket.js'
+import wsurl from './helpers/wsurl.js'
 
 const endpoint = wsurl + '/echo'
 

test/duplex.spec.ts

@@ -1,11 +1,11 @@
 import { expect } from 'aegir/chai'
-import WebSocket from '../src/web-socket.js'
+import delay from 'delay'
 import drain from 'it-drain'
 import { pipe } from 'it-pipe'
-import wsurl from './helpers/wsurl.js'
-import * as WS from '../src/index.js'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
-import delay from 'delay'
+import * as WS from '../src/index.js'
+import WebSocket from '../src/web-socket.js'
+import wsurl from './helpers/wsurl.js'
 
 const endpoint = wsurl + '/echo'
 

test/echo-inline.spec.ts

@@ -1,11 +1,11 @@
 import { expect } from 'aegir/chai'
-import * as WS from '../src/index.js'
-import * as ndjson from 'it-ndjson'
-import map from 'it-map'
 import all from 'it-all'
+import map from 'it-map'
+import * as ndjson from 'it-ndjson'
 import { pipe } from 'it-pipe'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { isNode, isElectronMain } from 'wherearewe'
+import * as WS from '../src/index.js'
 
 describe('simple echo server', () => {
   if (!(isNode || isElectronMain)) {
@@ -23,7 +23,7 @@ describe('simple echo server', () => {
       [1, 2, 3],
       // need a delay, because otherwise ws hangs up wrong.
       // otherwise use pull-goodbye.
-      (source) => map(source, async val => await new Promise(resolve => setTimeout(() => { resolve(val) }, 10))),
+      (source) => map(source, async val => new Promise(resolve => setTimeout(() => { resolve(val) }, 10))),
       (source) => map(ndjson.stringify(source), str => uint8ArrayFromString(str)),
       WS.connect('ws://localhost:5678'),
       ndjson.parse,

test/echo.spec.ts

@@ -1,12 +1,12 @@
 import { expect } from 'aegir/chai'
-import WebSocket from '../src/web-socket.js'
-import * as WS from '../src/index.js'
-import { pipe } from 'it-pipe'
-import { goodbye } from 'it-goodbye'
-import wsurl from './helpers/wsurl.js'
-import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import drain from 'it-drain'
 import each from 'it-foreach'
+import { goodbye } from 'it-goodbye'
+import { pipe } from 'it-pipe'
+import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
+import * as WS from '../src/index.js'
+import WebSocket from '../src/web-socket.js'
+import wsurl from './helpers/wsurl.js'
 
 const endpoint = wsurl + '/echo'
 

test/error.spec.ts

@@ -1,10 +1,10 @@
 import { expect } from 'aegir/chai'
-import WebSocket from '../src/web-socket.js'
+import drain from 'it-drain'
 import { pipe } from 'it-pipe'
+import defer from 'p-defer'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import * as WS from '../src/index.js'
-import drain from 'it-drain'
-import defer from 'p-defer'
+import WebSocket from '../src/web-socket.js'
 
 describe('error', () => {
   // connect to a server that does not exist, and check that it errors.

test/load.spec.ts

@@ -1,6 +1,6 @@
-import { pipe } from 'it-pipe'
-import each from 'it-foreach'
 import drain from 'it-drain'
+import each from 'it-foreach'
+import { pipe } from 'it-pipe'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { isNode, isElectronMain } from 'wherearewe'
 import * as WS from '../src/index.js'

test/pass-in-server.spec.ts

@@ -1,12 +1,12 @@
+import http from 'http'
 import { expect } from 'aegir/chai'
-import * as WS from '../src/index.js'
+import all from 'it-all'
+import map from 'it-map'
 import * as ndjson from 'it-ndjson'
 import { pipe } from 'it-pipe'
-import map from 'it-map'
-import all from 'it-all'
-import http from 'http'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { isNode, isElectronMain } from 'wherearewe'
+import * as WS from '../src/index.js'
 import type { WebSocketServer } from '../src/server.js'
 
 describe('simple echo server', () => {
@@ -40,7 +40,7 @@ describe('simple echo server', () => {
       [1, 2, 3],
       // need a delay, because otherwise ws hangs up wrong.
       // otherwise use pull-goodbye.
-      (source) => map(source, async val => await new Promise(resolve => setTimeout(() => { resolve(val) }, 10))),
+      (source) => map(source, async val => new Promise(resolve => setTimeout(() => { resolve(val) }, 10))),
       (source) => map(ndjson.stringify(source), str => uint8ArrayFromString(str)),
       stream,
       ndjson.parse,

test/read.spec.ts

@@ -1,10 +1,10 @@
 import { expect } from 'aegir/chai'
-import WebSocket from '../src/web-socket.js'
-import { pipe } from 'it-pipe'
 import all from 'it-all'
+import { pipe } from 'it-pipe'
+import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
 import * as WS from '../src/index.js'
+import WebSocket from '../src/web-socket.js'
 import wsurl from './helpers/wsurl.js'
-import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
 
 const endpoint = wsurl + '/read'
 
@@ -22,7 +22,7 @@ describe('read', () => {
   it('read values from the socket and end normally', async function () {
     const values = await pipe(
       WS.duplex(socket),
-      async (source) => await all(source)
+      async (source) => all(source)
     )
 
     expect(values.map((arr: Uint8Array) => uint8ArrayToString(arr))).to.deep.equal(['a', 'b', 'c', 'd'])
@@ -31,7 +31,7 @@ describe('read', () => {
   it('read values from a new socket and end normally', async function () {
     const values = await pipe(
       WS.duplex(new WebSocket(endpoint)),
-      async (source) => await all(source)
+      async (source) => all(source)
     )
 
     expect(values.map((arr: Uint8Array) => uint8ArrayToString(arr))).to.deep.equal(['a', 'b', 'c', 'd'])

test/server-echo.spec.ts

@@ -1,13 +1,13 @@
 import { expect } from 'aegir/chai'
-import * as WS from '../src/index.js'
-import * as ndjson from 'it-ndjson'
-import { pipe } from 'it-pipe'
-import map from 'it-map'
+import delay from 'delay'
 import all from 'it-all'
 import each from 'it-foreach'
-import delay from 'delay'
+import map from 'it-map'
+import * as ndjson from 'it-ndjson'
+import { pipe } from 'it-pipe'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { isNode, isElectronMain } from 'wherearewe'
+import * as WS from '../src/index.js'
 
 describe('simple echo server', () => {
   if (!(isNode || isElectronMain)) {