chore: enable webkit tests in interop (#2541)

Closes #1808

---------

Co-authored-by: Alex Potsides <alex@achingbrain.net>

Author: maschad

.github/workflows/main.yml

@@ -231,7 +231,7 @@ jobs:
       - uses: libp2p/test-plans/.github/actions/run-interop-ping-test@master
         with:
           test-filter: js-libp2p-head
-          extra-versions: ${{ github.workspace }}/interop/node-version.json ${{ github.workspace }}/interop/chromium-version.json ${{ github.workspace }}/interop/firefox-version.json
+          extra-versions: ${{ github.workspace }}/interop/node-version.json ${{ github.workspace }}/interop/chromium-version.json ${{ github.workspace }}/interop/firefox-version.json ${{ github.workspace }}/interop/webkit-version.json
           s3-cache-bucket: ${{ vars.S3_LIBP2P_BUILD_CACHE_BUCKET_NAME }}
           s3-access-key-id: ${{ vars.S3_LIBP2P_BUILD_CACHE_AWS_ACCESS_KEY_ID }}
           s3-secret-access-key: ${{ secrets.S3_LIBP2P_BUILD_CACHE_AWS_SECRET_ACCESS_KEY }}

interop/Makefile

@@ -1,9 +1,7 @@
 image_name := js-libp2p-head
 TEST_SOURCES := $(wildcard test/*.ts)
 
-# Enable webkit once https://github.com/libp2p/js-libp2p/pull/1627 is in
-# all: image.json webkit-image.json firefox-image.json chromium-image.json
-all: image.json firefox-image.json chromium-image.json
+all: image.json firefox-image.json chromium-image.json webkit-image.json
 
 image.json: Dockerfile $(TEST_SOURCES) package.json .aegir.js
 	cd .. && docker build -f interop/Dockerfile -t node-${image_name} .

interop/webkit-version.json

@@ -1,12 +1,17 @@
 {
-    "id": "webkit-js-libp2p-head",
-    "containerImageID": "webkit-js-libp2p-head",
-    "transports": [],
-    "secureChannels": [
-        "noise"
-    ],
-    "muxers": [
-        "yamux",
-        "mplex"
-    ]
-}
+  "id": "webkit-js-libp2p-head",
+  "containerImageID": "webkit-js-libp2p-head",
+    "transports": [
+    {
+      "name": "webrtc-direct",
+      "onlyDial": true
+    },
+    "webrtc",
+    {
+      "name": "wss",
+      "onlyDial": true
+    }
+  ],
+  "secureChannels": ["noise"],
+  "muxers": ["yamux", "mplex"]
+}

package.json

@@ -21,6 +21,7 @@
     "test:firefox": "aegir run test:firefox",
     "test:firefox-webworker": "aegir run test:firefox-webworker",
     "test:electron-main": "aegir run test:electron-main",
+    "test:webkit": "aegir run test:webkit",
     "test:cli": "aegir run test:cli",
     "test:interop": "aegir run test:interop",
     "coverage": "aegir run coverage",

packages/transport-webrtc/package.json

@@ -43,6 +43,7 @@
     "test:node": "aegir test -t node --cov -- --exit",
     "test:chrome": "aegir test -t browser --cov",
     "test:firefox": "aegir test -t browser -- --browser firefox",
+    "test:webkit": "aegir test -t browser -- --browser webkit",
     "lint": "aegir lint",
     "lint:fix": "aegir lint --fix",
     "clean": "aegir clean",