Upgrade wasm to support go 1.12+

Author: maxmcd

Dockerfile

@@ -1,12 +1,10 @@
-FROM golang:1.11.2-stretch
+FROM golang:1.15
 
 RUN apt-get update && \
-    curl -sL https://deb.nodesource.com/setup_11.x | bash -\
+    curl -sL https://deb.nodesource.com/setup_12.x | bash -\
     && apt-get install -y --no-install-recommends \
-    nodejs=11.2.0* \
+    nodejs=12.* \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /go/src/github.com/maxmcd/webtty
-
-

web-client/package.json

@@ -9,20 +9,23 @@
   "main": "src/app.ts",
   "scripts": {
     "build": "npm run go-build && parcel build src/index.html --public-url .",
-    "go-build":
-      "mkdir -p ./dist/ && touch ./dist/foo && rm ./dist/* && GOOS=js GOARCH=wasm go build -o ./dist/main.wasm ./src",
+    "go-build": "mkdir -p ./dist/ && touch ./dist/foo && rm ./dist/* && GOOS=js GOARCH=wasm go build -o ./dist/main.wasm ./src",
     "serve": "parcel serve src/index.html",
     "test": "echo notests",
     "deploy": "npm run build && gh-pages -d dist"
   },
   "author": "Max McDonnell",
   "license": "MIT",
   "dependencies": {
-    "@babel/core": "^7.1.5",
-    "@babel/runtime-corejs2": "^7.1.5",
+    "@babel/runtime-corejs2": "^7.12.5",
     "gh-pages": "^2.0.1",
     "parcel-bundler": "^1.10.3",
-    "typescript": "^3.1.6",
-    "xterm": "^3.8.0"
+    "xterm": "3.8.0"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.12.10",
+    "@babel/plugin-transform-runtime": "^7.12.10",
+    "cssnano": "^4.1.10",
+    "typescript": "^3.9.7"
   }
 }

web-client/src/main.go

@@ -17,7 +17,7 @@ var (
 	nonce string
 )
 
-func encode(i []js.Value) {
+func encode(this js.Value, i []js.Value) interface{} {
 	encoded, err := func() (string, string) {
 		answerSd := sd.SessionDescription{
 			Sdp:   i[0].String(),
@@ -37,9 +37,10 @@ func encode(i []js.Value) {
 		return sd.Encode(answerSd), ""
 	}()
 	i[1].Invoke(encoded, err)
+	return nil
 }
 
-func decode(i []js.Value) {
+func decode(this js.Value, i []js.Value) interface{} {
 	sdp, tkbsl, err := func() (string, string, string) {
 		offer, err := sd.Decode(i[0].String())
 		if err != nil {
@@ -55,9 +56,10 @@ func decode(i []js.Value) {
 		return offer.Sdp, offer.TenKbSiteLoc, ""
 	}()
 	i[1].Invoke(sdp, tkbsl, err)
+	return nil
 }
 
 func registerCallbacks() {
-	js.Global().Set("encode", js.NewCallback(encode))
-	js.Global().Set("decode", js.NewCallback(decode))
+	js.Global().Set("encode", js.FuncOf(encode))
+	js.Global().Set("decode", js.FuncOf(decode))
 }