Run gofmt to add new build constraints

Also remove some 1.13 specific WASM code
adriancable · Jan 18, 2022 · 157220e · 157220e
1 parent 04ca449
commit 157220e
Show file tree

Hide file tree

Showing 78 changed files with 94 additions and 43 deletions.
diff --git a/api.go b/api.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc

diff --git a/api_js.go b/api_js.go
@@ -1,3 +1,4 @@
+//go:build js && wasm
 // +build js,wasm
 
 package webrtc

diff --git a/api_test.go b/api_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc

diff --git a/certificate.go b/certificate.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc

diff --git a/certificate_test.go b/certificate_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc

diff --git a/configuration.go b/configuration.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc

diff --git a/configuration_js.go b/configuration_js.go
@@ -1,3 +1,4 @@
+//go:build js && wasm
 // +build js,wasm
 
 package webrtc

diff --git a/datachannel.go b/datachannel.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc

diff --git a/datachannel_go_test.go b/datachannel_go_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc

diff --git a/datachannel_js.go b/datachannel_js.go
@@ -1,3 +1,4 @@
+//go:build js && wasm
 // +build js,wasm
 
 package webrtc
@@ -162,7 +163,7 @@ func (d *DataChannel) Label() string {
 // out-of-order delivery is allowed.
 func (d *DataChannel) Ordered() bool {
 	ordered := d.underlying.Get("ordered")
-	if jsValueIsUndefined(ordered) {
+	if ordered.IsUndefined() {
 		return true // default is true
 	}
 	return ordered.Bool()
@@ -171,13 +172,13 @@ func (d *DataChannel) Ordered() bool {
 // MaxPacketLifeTime represents the length of the time window (msec) during
 // which transmissions and retransmissions may occur in unreliable mode.
 func (d *DataChannel) MaxPacketLifeTime() *uint16 {
-	if !jsValueIsUndefined(d.underlying.Get("maxPacketLifeTime")) {
+	if !d.underlying.Get("maxPacketLifeTime").IsUndefined() {
 		return valueToUint16Pointer(d.underlying.Get("maxPacketLifeTime"))
-	} else {
-		// See https://bugs.chromium.org/p/chromium/issues/detail?id=696681
-		// Chrome calls this "maxRetransmitTime"
-		return valueToUint16Pointer(d.underlying.Get("maxRetransmitTime"))
 	}
+
+	// See https://bugs.chromium.org/p/chromium/issues/detail?id=696681
+	// Chrome calls this "maxRetransmitTime"
+	return valueToUint16Pointer(d.underlying.Get("maxRetransmitTime"))
 }
 
 // MaxRetransmits represents the maximum number of retransmissions that are

diff --git a/datachannel_js_detach.go b/datachannel_js_detach.go
@@ -1,3 +1,4 @@
+//go:build js && wasm
 // +build js,wasm
 
 package webrtc

diff --git a/dtlstransport.go b/dtlstransport.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc

diff --git a/dtlstransport_test.go b/dtlstransport_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc

diff --git a/e2e/e2e_test.go b/e2e/e2e_test.go
@@ -1,3 +1,4 @@
+//go:build e2e
 // +build e2e
 
 package main

diff --git a/examples/broadcast/main.go b/examples/broadcast/main.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package main

diff --git a/examples/custom-logger/main.go b/examples/custom-logger/main.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package main

diff --git a/examples/data-channels-detach/jsfiddle/main.go b/examples/data-channels-detach/jsfiddle/main.go
@@ -1,3 +1,4 @@
+//go:build js && wasm
 // +build js,wasm
 
 package main

diff --git a/examples/data-channels/jsfiddle/main.go b/examples/data-channels/jsfiddle/main.go
@@ -1,3 +1,4 @@
+//go:build js && wasm
 // +build js,wasm
 
 package main

diff --git a/examples/ice-single-port/main.go b/examples/ice-single-port/main.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package main

diff --git a/examples/ice-tcp/main.go b/examples/ice-tcp/main.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package main

diff --git a/examples/insertable-streams/main.go b/examples/insertable-streams/main.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package main

diff --git a/examples/ortc/main.go b/examples/ortc/main.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package main

diff --git a/examples/play-from-disk-renegotation/main.go b/examples/play-from-disk-renegotation/main.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package main

diff --git a/examples/play-from-disk/main.go b/examples/play-from-disk/main.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package main

diff --git a/examples/reflect/main.go b/examples/reflect/main.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package main

diff --git a/examples/rtcp-processing/main.go b/examples/rtcp-processing/main.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package main

diff --git a/examples/rtp-forwarder/main.go b/examples/rtp-forwarder/main.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package main

diff --git a/examples/rtp-to-webrtc/main.go b/examples/rtp-to-webrtc/main.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package main

diff --git a/examples/save-to-disk/main.go b/examples/save-to-disk/main.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package main

diff --git a/examples/simulcast/main.go b/examples/simulcast/main.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package main

diff --git a/examples/swap-tracks/main.go b/examples/swap-tracks/main.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package main

diff --git a/examples/vnet/show-network-usage/main.go b/examples/vnet/show-network-usage/main.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package main

diff --git a/ice_go.go b/ice_go.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc

diff --git a/icegatherer.go b/icegatherer.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc

diff --git a/icegatherer_test.go b/icegatherer_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc

diff --git a/iceserver.go b/iceserver.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc

diff --git a/iceserver_js.go b/iceserver_js.go
@@ -1,3 +1,4 @@
+//go:build js && wasm
 // +build js,wasm
 
 package webrtc

diff --git a/iceserver_test.go b/iceserver_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc

diff --git a/icetransport.go b/icetransport.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc

diff --git a/icetransport_test.go b/icetransport_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc

diff --git a/interceptor.go b/interceptor.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc

diff --git a/interceptor_test.go b/interceptor_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc

diff --git a/js_compare.go b/js_compare.go
diff --git a/js_compare_legacy.go b/js_compare_legacy.go
diff --git a/js_utils.go b/js_utils.go
@@ -1,3 +1,4 @@
+//go:build js && wasm
 // +build js,wasm
 
 package webrtc
@@ -42,15 +43,15 @@ func awaitPromise(promise js.Value) (js.Value, error) {
 }
 
 func valueToUint16Pointer(val js.Value) *uint16 {
-	if jsValueIsNull(val) || jsValueIsUndefined(val) {
+	if val.IsNull() || val.IsUndefined() {
 		return nil
 	}
 	convertedVal := uint16(val.Int())
 	return &convertedVal
 }
 
 func valueToStringPointer(val js.Value) *string {
-	if jsValueIsNull(val) || jsValueIsUndefined(val) {
+	if val.IsNull() || val.IsUndefined() {
 		return nil
 	}
 	stringVal := val.String()
@@ -79,28 +80,28 @@ func interfaceToValueOrUndefined(val interface{}) js.Value {
 }
 
 func valueToStringOrZero(val js.Value) string {
-	if jsValueIsUndefined(val) || jsValueIsNull(val) {
+	if val.IsUndefined() || val.IsNull() {
 		return ""
 	}
 	return val.String()
 }
 
 func valueToUint8OrZero(val js.Value) uint8 {
-	if jsValueIsUndefined(val) || jsValueIsNull(val) {
+	if val.IsUndefined() || val.IsNull() {
 		return 0
 	}
 	return uint8(val.Int())
 }
 
 func valueToUint16OrZero(val js.Value) uint16 {
-	if jsValueIsNull(val) || jsValueIsUndefined(val) {
+	if val.IsNull() || val.IsUndefined() {
 		return 0
 	}
 	return uint16(val.Int())
 }
 
 func valueToUint32OrZero(val js.Value) uint32 {
-	if jsValueIsNull(val) || jsValueIsUndefined(val) {
+	if val.IsNull() || val.IsUndefined() {
 		return 0
 	}
 	return uint32(val.Int())

diff --git a/mediaengine.go b/mediaengine.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc

diff --git a/mediaengine_test.go b/mediaengine_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc

diff --git a/ortc_datachannel_test.go b/ortc_datachannel_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc

diff --git a/ortc_media_test.go b/ortc_media_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc

diff --git a/ortc_test.go b/ortc_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc

diff --git a/peerconnection.go b/peerconnection.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc

diff --git a/peerconnection_close_test.go b/peerconnection_close_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc

diff --git a/peerconnection_go_test.go b/peerconnection_go_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc