Skip to content
This repository was archived by the owner on Apr 24, 2023. It is now read-only.

Commit 7dece01

Browse files
achingbrainachingbrain
committed
deps!: update all dependencies
1 parent 7bd72df commit 7dece01

22 files changed

+230
-114
lines changed

‎.github/workflows/js-test-and-release.yml

Lines changed: 49 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: test & maybe release
22
on:
33
push:
44
branches:
5-
- master # with #262 - ${{{ github.default_branch }}}
5+
- ${{{ github.default_branch }}}
66
pull_request:
77

88
jobs:
@@ -33,7 +33,7 @@ jobs:
3333
node-version: ${{ matrix.node }}
3434
- uses: ipfs/aegir/actions/cache-node-modules@master
3535
- run: npm run --if-present test:node
36-
- uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378 # v3.1.0
36+
- uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # v3.1.1
3737
with:
3838
flags: node
3939

@@ -47,7 +47,7 @@ jobs:
4747
node-version: lts/*
4848
- uses: ipfs/aegir/actions/cache-node-modules@master
4949
- run: npm run --if-present test:chrome
50-
- uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378 # v3.1.0
50+
- uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # v3.1.1
5151
with:
5252
flags: chrome
5353

@@ -61,7 +61,7 @@ jobs:
6161
node-version: lts/*
6262
- uses: ipfs/aegir/actions/cache-node-modules@master
6363
- run: npm run --if-present test:chrome-webworker
64-
- uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378 # v3.1.0
64+
- uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # v3.1.1
6565
with:
6666
flags: chrome-webworker
6767

@@ -75,7 +75,7 @@ jobs:
7575
node-version: lts/*
7676
- uses: ipfs/aegir/actions/cache-node-modules@master
7777
- run: npm run --if-present test:firefox
78-
- uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378 # v3.1.0
78+
- uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # v3.1.1
7979
with:
8080
flags: firefox
8181

@@ -89,10 +89,48 @@ jobs:
8989
node-version: lts/*
9090
- uses: ipfs/aegir/actions/cache-node-modules@master
9191
- run: npm run --if-present test:firefox-webworker
92-
- uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378 # v3.1.0
92+
- uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # v3.1.1
9393
with:
9494
flags: firefox-webworker
9595

96+
test-webkit:
97+
needs: check
98+
runs-on: ${{ matrix.os }}
99+
strategy:
100+
matrix:
101+
os: [ubuntu-latest, macos-latest]
102+
node: [lts/*]
103+
fail-fast: true
104+
steps:
105+
- uses: actions/checkout@v3
106+
- uses: actions/setup-node@v3
107+
with:
108+
node-version: lts/*
109+
- uses: ipfs/aegir/actions/cache-node-modules@master
110+
- run: npm run --if-present test:webkit
111+
- uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # v3.1.1
112+
with:
113+
flags: webkit
114+
115+
test-webkit-webworker:
116+
needs: check
117+
runs-on: ${{ matrix.os }}
118+
strategy:
119+
matrix:
120+
os: [ubuntu-latest, macos-latest]
121+
node: [lts/*]
122+
fail-fast: true
123+
steps:
124+
- uses: actions/checkout@v3
125+
- uses: actions/setup-node@v3
126+
with:
127+
node-version: lts/*
128+
- uses: ipfs/aegir/actions/cache-node-modules@master
129+
- run: npm run --if-present test:webkit-webworker
130+
- uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # v3.1.1
131+
with:
132+
flags: webkit-webworker
133+
96134
test-electron-main:
97135
needs: check
98136
runs-on: ubuntu-latest
@@ -103,7 +141,7 @@ jobs:
103141
node-version: lts/*
104142
- uses: ipfs/aegir/actions/cache-node-modules@master
105143
- run: npx xvfb-maybe npm run --if-present test:electron-main
106-
- uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378 # v3.1.0
144+
- uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # v3.1.1
107145
with:
108146
flags: electron-main
109147

@@ -117,14 +155,14 @@ jobs:
117155
node-version: lts/*
118156
- uses: ipfs/aegir/actions/cache-node-modules@master
119157
- run: npx xvfb-maybe npm run --if-present test:electron-renderer
120-
- uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378 # v3.1.0
158+
- uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # v3.1.1
121159
with:
122160
flags: electron-renderer
123161

124162
release:
125-
needs: [test-node, test-chrome, test-chrome-webworker, test-firefox, test-firefox-webworker, test-electron-main, test-electron-renderer]
163+
needs: [test-node, test-chrome, test-chrome-webworker, test-firefox, test-firefox-webworker, test-webkit, test-webkit-webworker, test-electron-main, test-electron-renderer]
126164
runs-on: ubuntu-latest
127-
if: github.event_name == 'push' && github.ref == 'refs/heads/master' # with #262 - 'refs/heads/${{{ github.default_branch }}}'
165+
if: github.event_name == 'push' && github.ref == 'refs/heads/${{{ github.default_branch }}}'
128166
steps:
129167
- uses: actions/checkout@v3
130168
with:
@@ -139,5 +177,5 @@ jobs:
139177
docker-username: ${{ secrets.DOCKER_USERNAME }}
140178
- run: npm run --if-present release
141179
env:
142-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
180+
GITHUB_TOKEN: ${{ secrets.UCI_GITHUB_TOKEN || github.token }}
143181
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,4 @@ test/test-data/go-ipfs-repo/LOG.old
4444
# while testing npm5
4545
package-lock.json
4646
yarn.lock
47+
.vscode

‎packages/webrtc-star-protocol/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,9 @@
132132
"release": "aegir release"
133133
},
134134
"dependencies": {
135-
"@multiformats/multiaddr": "^11.0.0",
136135
"socket.io-client": "^4.1.2"
137136
},
138137
"devDependencies": {
139-
"aegir": "^37.9.1"
138+
"aegir": "^38.1.8"
140139
}
141140
}

‎packages/webrtc-star-signalling-server/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@
144144
"@hapi/inert": "^7.0.0",
145145
"@libp2p/logger": "^2.0.0",
146146
"@libp2p/webrtc-star-protocol": "^3.0.0",
147-
"@multiformats/multiaddr": "^11.0.0",
147+
"@multiformats/multiaddr": "^12.1.2",
148148
"menoetius": "0.0.3",
149149
"minimist": "^1.2.5",
150150
"prom-client": "^14.0.0",
@@ -153,7 +153,7 @@
153153
},
154154
"devDependencies": {
155155
"@types/hapi__inert": "^5.2.3",
156-
"aegir": "^37.9.1",
156+
"aegir": "^38.1.8",
157157
"p-event": "^5.0.1",
158158
"p-wait-for": "^5.0.0",
159159
"socket.io-client-v2": "npm:socket.io-client@^2.3.0",

‎packages/webrtc-star-signalling-server/src/config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { logger } from '@libp2p/logger'
33
const log = logger('signalling-server')
44

55
export const config = {
6-
log: log,
6+
log,
77
hapi: {
88
port: process.env.PORT ?? 13579,
99
host: '0.0.0.0',

‎packages/webrtc-star-signalling-server/src/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export interface SigServer extends Server {
2626
io: SocketServer
2727
}
2828

29-
export async function sigServer (options: Options = {}) {
29+
export async function sigServer (options: Options = {}): Promise<SigServer> {
3030
const port = options.port ?? config.hapi.port
3131
const host = options.host ?? config.hapi.host
3232
const peers = new Map<string, WebRTCStarSocket>()
@@ -50,7 +50,7 @@ export async function sigServer (options: Options = {}) {
5050
http.io.attach(http.listener, {
5151
path: '/socket.io-next' // v3/v4 clients might be using this path
5252
})
53-
http.events.on('stop', () => http.io.close())
53+
http.events.on('stop', () => { http.io.close() })
5454

5555
await http.register(Inert)
5656
await http.start()

‎packages/webrtc-star-signalling-server/src/socket-server.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ const fake = {
1414
}
1515
}
1616

17-
export function socketServer (peers: Map<string, WebRTCStarSocket>, hasMetrics: boolean, refreshPeerListIntervalMS: number) {
17+
export function socketServer (peers: Map<string, WebRTCStarSocket>, hasMetrics: boolean, refreshPeerListIntervalMS: number): Server {
1818
const io = new Server({
1919
allowEIO3: true // allow socket.io v2 clients to connect
2020
})
2121
// @ts-expect-error types are different?
22-
io.on('connection', (socket) => handle(socket))
22+
io.on('connection', (socket) => { handle(socket) })
2323

2424
const peersMetric = hasMetrics ? new client.Gauge({ name: 'webrtc_star_peers', help: 'peers online now' }) : fake.gauge
2525
const dialsSuccessTotal = hasMetrics ? new client.Counter({ name: 'webrtc_star_dials_total_success', help: 'successfully completed dials since server started' }) : fake.counter
@@ -29,9 +29,9 @@ export function socketServer (peers: Map<string, WebRTCStarSocket>, hasMetrics:
2929
const joinsFailureTotal = hasMetrics ? new client.Counter({ name: 'webrtc_star_joins_total_failure', help: 'failed joins since server started' }) : fake.counter
3030
const joinsTotal = hasMetrics ? new client.Counter({ name: 'webrtc_star_joins_total', help: 'all joins since server started' }) : fake.counter
3131

32-
const refreshMetrics = () => peersMetric.set(peers.size)
32+
const refreshMetrics = (): void => { peersMetric.set(peers.size) }
3333

34-
function safeEmit (maStr: string, event: any, arg: any) {
34+
function safeEmit (maStr: string, event: any, arg: any): void {
3535
const peer = peers.get(maStr)
3636

3737
if (peer == null) {
@@ -42,15 +42,15 @@ export function socketServer (peers: Map<string, WebRTCStarSocket>, hasMetrics:
4242
peer.emit(event, arg)
4343
}
4444

45-
function handle (socket: WebRTCStarSocket) {
45+
function handle (socket: WebRTCStarSocket): void {
4646
let multiaddr: string
4747

4848
// join this signaling server network
4949
socket.on('ss-join', (maStr: string) => {
5050
joinsTotal.inc()
5151

5252
if (maStr == null) {
53-
return joinsFailureTotal.inc()
53+
joinsFailureTotal.inc(); return
5454
}
5555

5656
multiaddr = maStr
@@ -63,7 +63,7 @@ export function socketServer (peers: Map<string, WebRTCStarSocket>, hasMetrics:
6363
let refreshInterval: NodeJS.Timer | undefined = setInterval(sendPeers, refreshPeerListIntervalMS)
6464
sendPeers()
6565

66-
function sendPeers () {
66+
function sendPeers (): void {
6767
for (const mh of peers.keys()) {
6868
if (mh === multiaddr) {
6969
continue
@@ -73,7 +73,7 @@ export function socketServer (peers: Map<string, WebRTCStarSocket>, hasMetrics:
7373
}
7474
}
7575

76-
function stopSendingPeers () {
76+
function stopSendingPeers (): void {
7777
if (refreshInterval != null) {
7878
clearInterval(refreshInterval)
7979
refreshInterval = undefined
@@ -101,7 +101,7 @@ export function socketServer (peers: Map<string, WebRTCStarSocket>, hasMetrics:
101101
dialsTotal.inc()
102102

103103
if (offer == null || typeof offer !== 'object' || offer.srcMultiaddr == null || offer.dstMultiaddr == null) {
104-
return dialsFailureTotal.inc()
104+
dialsFailureTotal.inc(); return
105105
}
106106

107107
if (offer.answer === true) {

‎packages/webrtc-star-signalling-server/test/sig-server.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import pWaitFor from 'p-wait-for'
77
import { pEvent } from 'p-event'
88
import type { WebRTCStarSocket } from '@libp2p/webrtc-star-protocol'
99

10-
export default (clientName: string, io: (url: string, opts: any) => WebRTCStarSocket, sioOptions: any) => {
10+
export default (clientName: string, io: (url: string, opts: any) => WebRTCStarSocket, sioOptions: any): void => {
1111
describe(`signalling ${clientName}`, () => {
1212
let sioUrl: string
1313
let sigS: SigServer
@@ -16,7 +16,7 @@ export default (clientName: string, io: (url: string, opts: any) => WebRTCStarSo
1616
let c3: WebRTCStarSocket
1717
let c4: WebRTCStarSocket
1818

19-
const base = (id: string) => {
19+
const base = (id: string): string => {
2020
return `/ip4/127.0.0.1/tcp/9090/ws/p2p-webrtc-star/ipfs/${id}`
2121
}
2222

@@ -110,7 +110,7 @@ export default (clientName: string, io: (url: string, opts: any) => WebRTCStarSo
110110
c3.on('connect', connected)
111111
c4.on('connect', connected)
112112

113-
function connected () {
113+
function connected (): void {
114114
if (++count === 3) { done() }
115115
}
116116
})
@@ -209,7 +209,7 @@ export default (clientName: string, io: (url: string, opts: any) => WebRTCStarSo
209209
check()
210210
})
211211

212-
function check () {
212+
function check (): void {
213213
if (++peersEmitted === 2) {
214214
done()
215215
}

‎packages/webrtc-star-transport/package.json

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
"scripts": {
128128
"clean": "aegir clean",
129129
"lint": "aegir lint",
130-
"dep-check": "aegir dep-check",
130+
"dep-check": "aegir dep-check -i @mapbox/node-pre-gyp",
131131
"build": "aegir build",
132132
"test": "aegir test",
133133
"test:node": "aegir test -t node -f ./dist/test/node.js --cov",
@@ -138,45 +138,43 @@
138138
"release": "aegir release"
139139
},
140140
"dependencies": {
141-
"@libp2p/interface-connection": "^3.0.1",
141+
"@libp2p/interface-connection": "^5.0.1",
142142
"@libp2p/interface-peer-discovery": "^1.0.0",
143143
"@libp2p/interface-peer-id": "^2.0.0",
144-
"@libp2p/interface-transport": "^2.0.0",
144+
"@libp2p/interface-transport": "^4.0.0",
145145
"@libp2p/interfaces": "^3.0.2",
146146
"@libp2p/logger": "^2.0.0",
147147
"@libp2p/peer-id": "^2.0.0",
148-
"@libp2p/utils": "^3.0.1",
149148
"@libp2p/webrtc-peer": "^2.0.0",
150149
"@libp2p/webrtc-star-protocol": "^3.0.0",
151-
"@multiformats/mafmt": "^11.0.2",
152-
"@multiformats/multiaddr": "^11.0.0",
153-
"abortable-iterator": "^4.0.2",
150+
"@multiformats/mafmt": "^12.1.0",
151+
"@multiformats/multiaddr": "^12.1.2",
152+
"abortable-iterator": "^5.0.1",
154153
"delay": "^5.0.0",
155154
"err-code": "^3.0.1",
156155
"iso-random-stream": "^2.0.2",
157-
"multiformats": "^11.0.0",
158156
"p-defer": "^4.0.0",
159157
"socket.io-client": "^4.1.2",
160158
"uint8arrays": "^4.0.2"
161159
},
162160
"devDependencies": {
163-
"@libp2p/interface-mocks": "^9.0.0",
161+
"@libp2p/interface-mocks": "^11.0.0",
164162
"@libp2p/interface-peer-discovery-compliance-tests": "^2.0.0",
165-
"@libp2p/interface-transport-compliance-tests": "^3.0.0",
163+
"@libp2p/interface-registrar": "^2.0.10",
164+
"@libp2p/interface-transport-compliance-tests": "^4.0.0",
166165
"@libp2p/peer-id-factory": "^2.0.0",
167166
"@libp2p/webrtc-star-signalling-server": "^3.0.0",
168167
"@mapbox/node-pre-gyp": "^1.0.5",
169-
"aegir": "^37.9.1",
168+
"aegir": "^38.1.8",
170169
"electron-webrtc": "~0.3.0",
171-
"it-all": "^2.0.0",
172-
"it-pipe": "^2.0.3",
170+
"it-all": "^3.0.1",
171+
"it-pipe": "^3.0.1",
173172
"it-pushable": "^3.0.0",
174-
"it-stream-types": "^1.0.4",
173+
"it-stream-types": "^2.0.1",
175174
"p-event": "^5.0.1",
176175
"p-wait-for": "^5.0.0",
177176
"sinon": "^15.0.1",
178177
"uint8arraylist": "^2.3.2",
179-
"util": "^0.12.4",
180178
"wrtc": "^0.4.6"
181179
}
182180
}

0 commit comments

Comments
 (0)