deps!: update all dependencies

libp2p · Apr 24, 2023 · 7dece01 · 7dece01
1 parent 7bd72df
commit 7dece01
Show file tree

Hide file tree

Showing 22 changed files with 230 additions and 114 deletions.
diff --git a/.github/workflows/js-test-and-release.yml b/.github/workflows/js-test-and-release.yml
@@ -2,7 +2,7 @@ name: test & maybe release
 on:
   push:
     branches:
-      - master # with #262 - ${{{ github.default_branch }}}
+      - ${{{ github.default_branch }}}
   pull_request:
 
 jobs:
@@ -33,7 +33,7 @@ jobs:
           node-version: ${{ matrix.node }}
       - uses: ipfs/aegir/actions/cache-node-modules@master
       - run: npm run --if-present test:node
-      - uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378 # v3.1.0
+      - uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # v3.1.1
         with:
           flags: node
 
@@ -47,7 +47,7 @@ jobs:
           node-version: lts/*
       - uses: ipfs/aegir/actions/cache-node-modules@master
       - run: npm run --if-present test:chrome
-      - uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378 # v3.1.0
+      - uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # v3.1.1
         with:
           flags: chrome
 
@@ -61,7 +61,7 @@ jobs:
           node-version: lts/*
       - uses: ipfs/aegir/actions/cache-node-modules@master
       - run: npm run --if-present test:chrome-webworker
-      - uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378 # v3.1.0
+      - uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # v3.1.1
         with:
           flags: chrome-webworker
 
@@ -75,7 +75,7 @@ jobs:
           node-version: lts/*
       - uses: ipfs/aegir/actions/cache-node-modules@master
       - run: npm run --if-present test:firefox
-      - uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378 # v3.1.0
+      - uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # v3.1.1
         with:
           flags: firefox
 
@@ -89,10 +89,48 @@ jobs:
           node-version: lts/*
       - uses: ipfs/aegir/actions/cache-node-modules@master
       - run: npm run --if-present test:firefox-webworker
-      - uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378 # v3.1.0
+      - uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # v3.1.1
         with:
           flags: firefox-webworker
 
+  test-webkit:
+    needs: check
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        node: [lts/*]
+      fail-fast: true
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: lts/*
+      - uses: ipfs/aegir/actions/cache-node-modules@master
+      - run: npm run --if-present test:webkit
+      - uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # v3.1.1
+        with:
+          flags: webkit
+
+  test-webkit-webworker:
+    needs: check
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        node: [lts/*]
+      fail-fast: true
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: lts/*
+      - uses: ipfs/aegir/actions/cache-node-modules@master
+      - run: npm run --if-present test:webkit-webworker
+      - uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # v3.1.1
+        with:
+          flags: webkit-webworker
+
   test-electron-main:
     needs: check
     runs-on: ubuntu-latest
@@ -103,7 +141,7 @@ jobs:
           node-version: lts/*
       - uses: ipfs/aegir/actions/cache-node-modules@master
       - run: npx xvfb-maybe npm run --if-present test:electron-main
-      - uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378 # v3.1.0
+      - uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # v3.1.1
         with:
           flags: electron-main
 
@@ -117,14 +155,14 @@ jobs:
           node-version: lts/*
       - uses: ipfs/aegir/actions/cache-node-modules@master
       - run: npx xvfb-maybe npm run --if-present test:electron-renderer
-      - uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378 # v3.1.0
+      - uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # v3.1.1
         with:
           flags: electron-renderer
 
   release:
-    needs: [test-node, test-chrome, test-chrome-webworker, test-firefox, test-firefox-webworker, test-electron-main, test-electron-renderer]
+    needs: [test-node, test-chrome, test-chrome-webworker, test-firefox, test-firefox-webworker, test-webkit, test-webkit-webworker, test-electron-main, test-electron-renderer]
     runs-on: ubuntu-latest
-    if: github.event_name == 'push' && github.ref == 'refs/heads/master' # with #262 - 'refs/heads/${{{ github.default_branch }}}'
+    if: github.event_name == 'push' && github.ref == 'refs/heads/${{{ github.default_branch }}}'
     steps:
       - uses: actions/checkout@v3
         with:
@@ -139,5 +177,5 @@ jobs:
           docker-username: ${{ secrets.DOCKER_USERNAME }}
       - run: npm run --if-present release
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.UCI_GITHUB_TOKEN || github.token }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/.gitignore b/.gitignore
@@ -44,3 +44,4 @@ test/test-data/go-ipfs-repo/LOG.old
 # while testing npm5
 package-lock.json
 yarn.lock
+.vscode
diff --git a/packages/webrtc-star-protocol/package.json b/packages/webrtc-star-protocol/package.json
@@ -132,10 +132,9 @@
     "release": "aegir release"
   },
   "dependencies": {
-    "@multiformats/multiaddr": "^11.0.0",
     "socket.io-client": "^4.1.2"
   },
   "devDependencies": {
-    "aegir": "^37.9.1"
+    "aegir": "^38.1.8"
   }
 }
diff --git a/packages/webrtc-star-signalling-server/package.json b/packages/webrtc-star-signalling-server/package.json
@@ -144,7 +144,7 @@
     "@hapi/inert": "^7.0.0",
     "@libp2p/logger": "^2.0.0",
     "@libp2p/webrtc-star-protocol": "^3.0.0",
-    "@multiformats/multiaddr": "^11.0.0",
+    "@multiformats/multiaddr": "^12.1.2",
     "menoetius": "0.0.3",
     "minimist": "^1.2.5",
     "prom-client": "^14.0.0",
@@ -153,7 +153,7 @@
   },
   "devDependencies": {
     "@types/hapi__inert": "^5.2.3",
-    "aegir": "^37.9.1",
+    "aegir": "^38.1.8",
     "p-event": "^5.0.1",
     "p-wait-for": "^5.0.0",
     "socket.io-client-v2": "npm:socket.io-client@^2.3.0",

diff --git a/packages/webrtc-star-signalling-server/src/config.ts b/packages/webrtc-star-signalling-server/src/config.ts
@@ -3,7 +3,7 @@ import { logger } from '@libp2p/logger'
 const log = logger('signalling-server')
 
 export const config = {
-  log: log,
+  log,
   hapi: {
     port: process.env.PORT ?? 13579,
     host: '0.0.0.0',

diff --git a/packages/webrtc-star-signalling-server/src/index.ts b/packages/webrtc-star-signalling-server/src/index.ts
@@ -26,7 +26,7 @@ export interface SigServer extends Server {
   io: SocketServer
 }
 
-export async function sigServer (options: Options = {}) {
+export async function sigServer (options: Options = {}): Promise<SigServer> {
   const port = options.port ?? config.hapi.port
   const host = options.host ?? config.hapi.host
   const peers = new Map<string, WebRTCStarSocket>()
@@ -50,7 +50,7 @@ export async function sigServer (options: Options = {}) {
   http.io.attach(http.listener, {
     path: '/socket.io-next' // v3/v4 clients might be using this path
   })
-  http.events.on('stop', () => http.io.close())
+  http.events.on('stop', () => { http.io.close() })
 
   await http.register(Inert)
   await http.start()

diff --git a/packages/webrtc-star-signalling-server/src/socket-server.ts b/packages/webrtc-star-signalling-server/src/socket-server.ts
@@ -14,12 +14,12 @@ const fake = {
   }
 }
 
-export function socketServer (peers: Map<string, WebRTCStarSocket>, hasMetrics: boolean, refreshPeerListIntervalMS: number) {
+export function socketServer (peers: Map<string, WebRTCStarSocket>, hasMetrics: boolean, refreshPeerListIntervalMS: number): Server {
   const io = new Server({
     allowEIO3: true // allow socket.io v2 clients to connect
   })
   // @ts-expect-error types are different?
-  io.on('connection', (socket) => handle(socket))
+  io.on('connection', (socket) => { handle(socket) })
 
   const peersMetric = hasMetrics ? new client.Gauge({ name: 'webrtc_star_peers', help: 'peers online now' }) : fake.gauge
   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:
   const joinsFailureTotal = hasMetrics ? new client.Counter({ name: 'webrtc_star_joins_total_failure', help: 'failed joins since server started' }) : fake.counter
   const joinsTotal = hasMetrics ? new client.Counter({ name: 'webrtc_star_joins_total', help: 'all joins since server started' }) : fake.counter
 
-  const refreshMetrics = () => peersMetric.set(peers.size)
+  const refreshMetrics = (): void => { peersMetric.set(peers.size) }
 
-  function safeEmit (maStr: string, event: any, arg: any) {
+  function safeEmit (maStr: string, event: any, arg: any): void {
     const peer = peers.get(maStr)
 
     if (peer == null) {
@@ -42,15 +42,15 @@ export function socketServer (peers: Map<string, WebRTCStarSocket>, hasMetrics:
     peer.emit(event, arg)
   }
 
-  function handle (socket: WebRTCStarSocket) {
+  function handle (socket: WebRTCStarSocket): void {
     let multiaddr: string
 
     // join this signaling server network
     socket.on('ss-join', (maStr: string) => {
       joinsTotal.inc()
 
       if (maStr == null) {
-        return joinsFailureTotal.inc()
+        joinsFailureTotal.inc(); return
       }
 
       multiaddr = maStr
@@ -63,7 +63,7 @@ export function socketServer (peers: Map<string, WebRTCStarSocket>, hasMetrics:
       let refreshInterval: NodeJS.Timer | undefined = setInterval(sendPeers, refreshPeerListIntervalMS)
       sendPeers()
 
-      function sendPeers () {
+      function sendPeers (): void {
         for (const mh of peers.keys()) {
           if (mh === multiaddr) {
             continue
@@ -73,7 +73,7 @@ export function socketServer (peers: Map<string, WebRTCStarSocket>, hasMetrics:
         }
       }
 
-      function stopSendingPeers () {
+      function stopSendingPeers (): void {
         if (refreshInterval != null) {
           clearInterval(refreshInterval)
           refreshInterval = undefined
@@ -101,7 +101,7 @@ export function socketServer (peers: Map<string, WebRTCStarSocket>, hasMetrics:
       dialsTotal.inc()
 
       if (offer == null || typeof offer !== 'object' || offer.srcMultiaddr == null || offer.dstMultiaddr == null) {
-        return dialsFailureTotal.inc()
+        dialsFailureTotal.inc(); return
       }
 
       if (offer.answer === true) {

diff --git a/packages/webrtc-star-signalling-server/test/sig-server.ts b/packages/webrtc-star-signalling-server/test/sig-server.ts
@@ -7,7 +7,7 @@ import pWaitFor from 'p-wait-for'
 import { pEvent } from 'p-event'
 import type { WebRTCStarSocket } from '@libp2p/webrtc-star-protocol'
 
-export default (clientName: string, io: (url: string, opts: any) => WebRTCStarSocket, sioOptions: any) => {
+export default (clientName: string, io: (url: string, opts: any) => WebRTCStarSocket, sioOptions: any): void => {
   describe(`signalling ${clientName}`, () => {
     let sioUrl: string
     let sigS: SigServer
@@ -16,7 +16,7 @@ export default (clientName: string, io: (url: string, opts: any) => WebRTCStarSo
     let c3: WebRTCStarSocket
     let c4: WebRTCStarSocket
 
-    const base = (id: string) => {
+    const base = (id: string): string => {
       return `/ip4/127.0.0.1/tcp/9090/ws/p2p-webrtc-star/ipfs/${id}`
     }
 
@@ -110,7 +110,7 @@ export default (clientName: string, io: (url: string, opts: any) => WebRTCStarSo
       c3.on('connect', connected)
       c4.on('connect', connected)
 
-      function connected () {
+      function connected (): void {
         if (++count === 3) { done() }
       }
     })
@@ -209,7 +209,7 @@ export default (clientName: string, io: (url: string, opts: any) => WebRTCStarSo
         check()
       })
 
-      function check () {
+      function check (): void {
         if (++peersEmitted === 2) {
           done()
         }

diff --git a/packages/webrtc-star-transport/package.json b/packages/webrtc-star-transport/package.json
@@ -127,7 +127,7 @@
   "scripts": {
     "clean": "aegir clean",
     "lint": "aegir lint",
-    "dep-check": "aegir dep-check",
+    "dep-check": "aegir dep-check -i @mapbox/node-pre-gyp",
     "build": "aegir build",
     "test": "aegir test",
     "test:node": "aegir test -t node -f ./dist/test/node.js --cov",
@@ -138,45 +138,43 @@
     "release": "aegir release"
   },
   "dependencies": {
-    "@libp2p/interface-connection": "^3.0.1",
+    "@libp2p/interface-connection": "^5.0.1",
     "@libp2p/interface-peer-discovery": "^1.0.0",
     "@libp2p/interface-peer-id": "^2.0.0",
-    "@libp2p/interface-transport": "^2.0.0",
+    "@libp2p/interface-transport": "^4.0.0",
     "@libp2p/interfaces": "^3.0.2",
     "@libp2p/logger": "^2.0.0",
     "@libp2p/peer-id": "^2.0.0",
-    "@libp2p/utils": "^3.0.1",
     "@libp2p/webrtc-peer": "^2.0.0",
     "@libp2p/webrtc-star-protocol": "^3.0.0",
-    "@multiformats/mafmt": "^11.0.2",
-    "@multiformats/multiaddr": "^11.0.0",
-    "abortable-iterator": "^4.0.2",
+    "@multiformats/mafmt": "^12.1.0",
+    "@multiformats/multiaddr": "^12.1.2",
+    "abortable-iterator": "^5.0.1",
     "delay": "^5.0.0",
     "err-code": "^3.0.1",
     "iso-random-stream": "^2.0.2",
-    "multiformats": "^11.0.0",
     "p-defer": "^4.0.0",
     "socket.io-client": "^4.1.2",
     "uint8arrays": "^4.0.2"
   },
   "devDependencies": {
-    "@libp2p/interface-mocks": "^9.0.0",
+    "@libp2p/interface-mocks": "^11.0.0",
     "@libp2p/interface-peer-discovery-compliance-tests": "^2.0.0",
-    "@libp2p/interface-transport-compliance-tests": "^3.0.0",
+    "@libp2p/interface-registrar": "^2.0.10",
+    "@libp2p/interface-transport-compliance-tests": "^4.0.0",
     "@libp2p/peer-id-factory": "^2.0.0",
     "@libp2p/webrtc-star-signalling-server": "^3.0.0",
     "@mapbox/node-pre-gyp": "^1.0.5",
-    "aegir": "^37.9.1",
+    "aegir": "^38.1.8",
     "electron-webrtc": "~0.3.0",
-    "it-all": "^2.0.0",
-    "it-pipe": "^2.0.3",
+    "it-all": "^3.0.1",
+    "it-pipe": "^3.0.1",
     "it-pushable": "^3.0.0",
-    "it-stream-types": "^1.0.4",
+    "it-stream-types": "^2.0.1",
     "p-event": "^5.0.1",
     "p-wait-for": "^5.0.0",
     "sinon": "^15.0.1",
     "uint8arraylist": "^2.3.2",
-    "util": "^0.12.4",
     "wrtc": "^0.4.6"
   }
 }