Merge pull request grafana#228 from gbts/master

Websocket implementation
Develop-X · Jun 12, 2017 · 45a0a6b · 45a0a6b
2 parents b2e140c + 26fc0f2
commit 45a0a6b
Show file tree

Hide file tree

Showing 7 changed files with 833 additions and 0 deletions.
diff --git a/js/common/state.go b/js/common/state.go
@@ -24,6 +24,7 @@ import (
 	"net/http"
 
 	"github.com/loadimpact/k6/lib"
+	"github.com/loadimpact/k6/lib/netext"
 	"github.com/loadimpact/k6/stats"
 	log "github.com/sirupsen/logrus"
 )
@@ -42,6 +43,9 @@ type State struct {
 	// Networking equipment.
 	HTTPTransport http.RoundTripper
 
+	// Also expose the underlying dialer
+	Dialer *netext.Dialer
+
 	// Sample buffer, emitted at the end of the iteration.
 	Samples []stats.Sample
 

diff --git a/js/modules/index.go b/js/modules/index.go
@@ -26,6 +26,7 @@ import (
 	"github.com/loadimpact/k6/js/modules/k6/html"
 	"github.com/loadimpact/k6/js/modules/k6/http"
 	"github.com/loadimpact/k6/js/modules/k6/metrics"
+	"github.com/loadimpact/k6/js/modules/k6/ws"
 )
 
 // Index of module implementations.
@@ -35,4 +36,5 @@ var Index = map[string]interface{}{
 	"k6/http":    &http.HTTP{},
 	"k6/metrics": &metrics.Metrics{},
 	"k6/html":    &html.HTML{},
+	"k6/ws":      &ws.WS{},
 }