Browser WSS testing

multidim-interop/go/v0.24/main.go

@@ -2,9 +2,15 @@ package main
 
 import (
 	"context"
+	"crypto/rand"
+	"crypto/rsa"
+	"crypto/tls"
+	"crypto/x509"
+	"crypto/x509/pkix"
 	"encoding/json"
 	"fmt"
 	"log"
+	"math/big"
 	"os"
 	"strconv"
 	"time"
@@ -80,6 +86,9 @@ func main() {
 	case "ws":
 		options = append(options, libp2p.Transport(websocket.New))
 		listenAddr = fmt.Sprintf("/ip4/%s/tcp/0/ws", ip)
+	case "wss":
+		options = append(options, libp2p.Transport(websocket.New, websocket.WithTLSConfig(generateTLSConfig()), websocket.WithTLSClientConfig(&tls.Config{InsecureSkipVerify: true})))
+		listenAddr = fmt.Sprintf("/ip4/%s/tcp/0/wss", ip)
 	case "tcp":
 		options = append(options, libp2p.Transport(tcp.NewTCPTransport))
 		listenAddr = fmt.Sprintf("/ip4/%s/tcp/0", ip)
@@ -195,3 +204,28 @@ func main() {
 		os.Exit(1)
 	}
 }
+
+func generateTLSConfig() *tls.Config {
+	priv, err := rsa.GenerateKey(rand.Reader, 2048)
+	if err != nil {
+		log.Fatal(err)
+	}
+	tmpl := &x509.Certificate{
+		SerialNumber:          big.NewInt(1),
+		Subject:               pkix.Name{},
+		SignatureAlgorithm:    x509.SHA256WithRSA,
+		NotBefore:             time.Now(),
+		NotAfter:              time.Now().Add(time.Hour), // valid for an hour
+		BasicConstraintsValid: true,
+	}
+	certDER, err := x509.CreateCertificate(rand.Reader, tmpl, tmpl, priv.Public(), priv)
+	if err != nil {
+		log.Fatal(err)
+	}
+	return &tls.Config{
+		Certificates: []tls.Certificate{{
+			PrivateKey:  priv,
+			Certificate: [][]byte{certDER},
+		}},
+	}
+}

multidim-interop/js/v0.42/.aegir.js

@@ -0,0 +1,82 @@
+import { createClient } from 'redis'
+import http from "http"
+
+const redis_addr = process.env.redis_addr || 'redis:6379'
+
+/** @type {import('aegir/types').PartialOptions} */
+export default {
+  test: {
+    browser: {
+      config: {
+        // Ignore self signed certificates
+        browserContextOptions: { ignoreHTTPSErrors: true }
+      }
+    },
+    async before() {
+      const redisClient = createClient({
+        url: `redis://${redis_addr}`
+      })
+      redisClient.on('error', (err) => console.error(`Redis Client Error: ${err}`))
+      await redisClient.connect()
+
+      const requestListener = async function (req, res) {
+        const requestJSON = await new Promise(resolve => {
+          let body = ""
+          req.on('data', function (data) {
+            body += data;
+          });
+
+          req.on('end', function () {
+            resolve(JSON.parse(body))
+          });
+        })
+
+        try {
+          const redisRes = await redisClient.sendCommand(requestJSON)
+          if (redisRes === null) {
+            throw new Error("redis sent back null")
+          }
+
+          res.writeHead(200, {
+            'Access-Control-Allow-Origin': '*'
+          })
+          res.end(JSON.stringify(redisRes))
+        } catch (err) {
+          console.error("Error in redis command:", err)
+          res.writeHead(500, {
+            'Access-Control-Allow-Origin': '*'
+          })
+          res.end(err.toString())
+          return
+        }
+
+
+      };
+
+      const proxyServer = http.createServer(requestListener);
+      await new Promise(resolve => { proxyServer.listen(0, "localhost", () => { resolve() }); })
+
+      return {
+        redisClient,
+        proxyServer: proxyServer,
+        env: {
+          ...process.env,
+          proxyPort: proxyServer.address().port
+        }
+      }
+    },
+    async after(_, { proxyServer, redisClient }) {
+      await new Promise(resolve => {
+        proxyServer.close(() => resolve());
+      })
+
+      try {
+        // We don't care if this fails
+        await redisClient.disconnect()
+      } catch { }
+    }
+  },
+  build: {
+    bundlesizeMax: '18kB'
+  }
+}

multidim-interop/js/v0.42/.dockerignore

@@ -0,0 +1 @@
+node_modules/

multidim-interop/js/v0.42/.gitignore

@@ -0,0 +1,3 @@
+dist
+node-image.json
+chromium-image.json

multidim-interop/js/v0.42/ChromiumDockerfile

@@ -0,0 +1,22 @@
+# syntax=docker/dockerfile:1
+
+FROM mcr.microsoft.com/playwright
+
+WORKDIR /app
+
+
+COPY package*.json .
+
+RUN npm ci
+
+# Install browsers
+RUN ./node_modules/.bin/playwright install
+
+COPY tsconfig.json .
+COPY .aegir.js .
+COPY test ./test
+COPY src ./src
+
+RUN npm run build
+
+ENTRYPOINT [ "npm", "test", "--", "--build", "false", "--types", "false", "-t", "browser" ]

multidim-interop/js/v0.42/Dockerfile

@@ -0,0 +1,17 @@
+# syntax=docker/dockerfile:1
+FROM node:18
+
+WORKDIR /app
+
+COPY package*.json .
+
+RUN npm ci
+
+COPY tsconfig.json .
+COPY .aegir.js .
+COPY test ./test
+COPY src ./src
+
+RUN npm run build
+
+ENTRYPOINT [ "npm", "test", "--", "--build", "false", "--types", "false", "-t", "node" ]

multidim-interop/js/v0.42/Makefile

@@ -0,0 +1,19 @@
+image_name := js-v0.42
+TEST_SOURCES := $(wildcard test/*.ts)
+
+all: chromium-image.json node-image.json
+
+chromium-image.json: ChromiumDockerfile $(TEST_SOURCES) package.json package-lock.json .aegir.js
+	IMAGE_NAME=chromium-${image_name} ../../dockerBuildWrapper.sh -f ChromiumDockerfile .
+	docker image inspect chromium-${image_name} -f "{{.Id}}" | \
+		xargs -I {} echo "{\"imageID\": \"{}\"}" > $@
+
+node-image.json: Dockerfile $(TEST_SOURCES) package.json package-lock.json .aegir.js
+	IMAGE_NAME=node-${image_name} ../../dockerBuildWrapper.sh -f Dockerfile .
+	docker image inspect node-${image_name} -f "{{.Id}}" | \
+		xargs -I {} echo "{\"imageID\": \"{}\"}" > $@
+
+.PHONY: clean
+
+clean:
+	rm *image.json