Fix byte sizes

Author: nhooyr

.github/workflows/ci.yml

@@ -4,23 +4,23 @@ on: [push]
 jobs:
   fmt:
     runs-on: ubuntu-latest
-    container: docker://nhooyr/websocket-ci@sha256:97aa0fddfcf1ba7d90a21b1e7978884b7f4c1ca9668d2ed1891ff61f778aeaf0
+    container: docker://nhooyr/websocket-ci@sha256:b6331f8f64803c8b1bbd2a0ee9e2547317e0de2348bccd9c8dbcc1d88ff5747f
     steps:
       - uses: actions/checkout@v1
         with:
           fetch-depth: 1
       - run: ./ci/fmt.sh
   lint:
     runs-on: ubuntu-latest
-    container: docker://nhooyr/websocket-ci@sha256:97aa0fddfcf1ba7d90a21b1e7978884b7f4c1ca9668d2ed1891ff61f778aeaf0
+    container: docker://nhooyr/websocket-ci@sha256:b6331f8f64803c8b1bbd2a0ee9e2547317e0de2348bccd9c8dbcc1d88ff5747f
     steps:
       - uses: actions/checkout@v1
         with:
           fetch-depth: 1
       - run: ./ci/lint.sh
   test:
     runs-on: ubuntu-latest
-    container: docker://nhooyr/websocket-ci@sha256:97aa0fddfcf1ba7d90a21b1e7978884b7f4c1ca9668d2ed1891ff61f778aeaf0
+    container: docker://nhooyr/websocket-ci@sha256:b6331f8f64803c8b1bbd2a0ee9e2547317e0de2348bccd9c8dbcc1d88ff5747f
     steps:
       - uses: actions/checkout@v1
         with:
@@ -30,7 +30,7 @@ jobs:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
   wasm:
     runs-on: ubuntu-latest
-    container: docker://nhooyr/websocket-ci@sha256:97aa0fddfcf1ba7d90a21b1e7978884b7f4c1ca9668d2ed1891ff61f778aeaf0
+    container: docker://nhooyr/websocket-ci@sha256:b6331f8f64803c8b1bbd2a0ee9e2547317e0de2348bccd9c8dbcc1d88ff5747f
     steps:
       - uses: actions/checkout@v1
         with:

ci/fmt.sh

@@ -18,7 +18,7 @@ fmt() {
   go run go.coder.com/go-tools/cmd/goimports -w "-local=$(go list -m)" .
   go run mvdan.cc/sh/cmd/shfmt -i 2 -w -s -sr .
   # shellcheck disable=SC2046
-  npx prettier \
+  npx -q prettier \
     --write \
     --print-width 120 \
     --no-semi \

ci/wasm.sh

@@ -4,22 +4,24 @@ set -euo pipefail
 cd "$(dirname "${0}")"
 cd "$(git rev-parse --show-toplevel)"
 
-stdout="$(mktemp -d)/stdout"
-mkfifo "$stdout"
-go run ./internal/wsecho/cmd > "$stdout" &
-
-WS_ECHO_SERVER_URL="$(head -n 1 "$stdout")"
-
 GOOS=js GOARCH=wasm go vet ./...
+
 go install golang.org/x/lint/golint
 GOOS=js GOARCH=wasm golint -set_exit_status ./...
+
+wsEchoOut="$(mktemp -d)/stdout"
+mkfifo "$wsEchoOut"
+go install ./internal/wsecho/cmd/wsecho
+wsecho > "$wsEchoOut" &
+
+WS_ECHO_SERVER_URL="$(timeout 10s head -n 1 "$wsEchoOut")" || true
+if [[ -z $WS_ECHO_SERVER_URL ]]; then
+  echo "./internal/wsecho/cmd/wsecho failed to start in 10s"
+  exit 1
+fi
+
 go install github.com/agnivade/wasmbrowsertest
-GOOS=js GOARCH=wasm go test -exec="wasmbrowsertest" ./... -args "$WS_ECHO_SERVER_URL"
+GOOS=js GOARCH=wasm go test -exec=wasmbrowsertest ./... -args "$WS_ECHO_SERVER_URL"
 
-echo kill
-jobs
 kill %1
-echo wait
 wait -n || true
-jobs
-echo over

internal/wsecho/cmd/main.go internal/wsecho/cmd/wsecho/main.gointernal/wsecho/cmd/main.go renamed to internal/wsecho/cmd/wsecho/main.go

@@ -30,16 +30,16 @@ func Serve(w http.ResponseWriter, r *http.Request) {
 
 // Loop echos every msg received from c until an error
 // occurs or the context expires.
-// The read limit is set to 1 << 40.
+// The read limit is set to 1 << 30.
 func Loop(ctx context.Context, c *websocket.Conn) {
 	defer c.Close(websocket.StatusInternalError, "")
 
-	c.SetReadLimit(1 << 40)
+	c.SetReadLimit(1 << 30)
 
 	ctx, cancel := context.WithTimeout(ctx, time.Minute)
 	defer cancel()
 
-	b := make([]byte, 32768)
+	b := make([]byte, 32<<10)
 	echo := func() error {
 		typ, r, err := c.Reader(ctx)
 		if err != nil {

internal/wsecho/wsecho.go

@@ -2,20 +2,18 @@ package websocket_test
 
 import (
 	"context"
+	"flag"
 	"net/http"
-	"os"
 	"testing"
 	"time"
 
 	"nhooyr.io/websocket"
 )
 
-var wsEchoServerURL = os.Args[1]
-
 func TestWebSocket(t *testing.T) {
 	t.Parallel()
 
-	t.Skip("???")
+	wsEchoServerURL := flag.Arg(0)
 
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
 	defer cancel()

websocket_js_test.go

@@ -963,14 +963,14 @@ func TestAutobahn(t *testing.T) {
 					return err
 				}
 				defer c.Close(websocket.StatusInternalError, "")
-				c.SetReadLimit(1 << 40)
 
 				ctx := r.Context()
 				if testingClient {
 					wsecho.Loop(r.Context(), c)
 					return nil
 				}
 
+				c.SetReadLimit(1 << 30)
 				err = fn(ctx, c)
 				if err != nil {
 					return err
@@ -997,9 +997,9 @@ func TestAutobahn(t *testing.T) {
 				t.Fatal(err)
 			}
 			defer c.Close(websocket.StatusInternalError, "")
-			c.SetReadLimit(1 << 40)
 
 			if testingClient {
+				c.SetReadLimit(1 << 30)
 				err = fn(ctx, c)
 				if err != nil {
 					t.Fatalf("client failed: %+v", err)