transform: Explicitly bind LiveReload to server port

If hugo server is run on port 80 or 443, LiveReload does not
correctly bind to the same port, instead using port 35729.
This commit adds functionality to inform LiveReload of the
correct port to bind to.

See https://github.com/livereload/livereload-js/issues/16

Partially contributed by Jeff Minard (@chuyskywalker).

Fixes #2205

diff --git a/transform/livereloadinject.go b/transform/livereloadinject.go
index bd22901dfc1d4b7517ea7fa1cd3196969af7e6f4..95608185d3269b4f0e576746d89c02db78bed18d 100644 (file)
--- a/transform/livereloadinject.go
+++ b/transform/livereloadinject.go
@@ -16,18 +16,21 @@ package transform
 import (
        "bytes"
        "fmt"
+
+       "github.com/spf13/viper"
 )
 
 func LiveReloadInject(ct contentTransformer) {
        endBodyTag := "</body>"
        match := []byte(endBodyTag)
-       replaceTemplate := `<script data-no-instant>document.write('<script src="/livereload.js?mindelay=10"></' + 'script>')</script>%s`
-       replace := []byte(fmt.Sprintf(replaceTemplate, endBodyTag))
+       port := viper.Get("port")
+       replaceTemplate := `<script data-no-instant>document.write('<script src="/livereload.js?port=%d&mindelay=10"></' + 'script>')</script>%s`
+       replace := []byte(fmt.Sprintf(replaceTemplate, port, endBodyTag))
 
        newcontent := bytes.Replace(ct.Content(), match, replace, 1)
        if len(newcontent) == len(ct.Content()) {
                endBodyTag = "</BODY>"
-               replace := []byte(fmt.Sprintf(replaceTemplate, endBodyTag))
+               replace := []byte(fmt.Sprintf(replaceTemplate, port, endBodyTag))
                match := []byte(endBodyTag)
                newcontent = bytes.Replace(ct.Content(), match, replace, 1)
        }

diff --git a/transform/livereloadinject_test.go b/transform/livereloadinject_test.go
index cf618e9ee410c12aff6c3e4cdaacf5f443199ace..9f28e05e2a19e97bde1ea7098da035db2d85fee4 100644 (file)
--- a/transform/livereloadinject_test.go
+++ b/transform/livereloadinject_test.go
@@ -18,6 +18,8 @@ import (
        "fmt"
        "strings"
        "testing"
+
+       "github.com/spf13/viper"
 )
 
 func TestLiveReloadInject(t *testing.T) {
@@ -26,13 +28,14 @@ func TestLiveReloadInject(t *testing.T) {
 }
 
 func doTestLiveReloadInject(t *testing.T, bodyEndTag string) {
+       viper.Set("port", 1313)
        out := new(bytes.Buffer)
        in := strings.NewReader(bodyEndTag)
 
        tr := NewChain(LiveReloadInject)
        tr.Apply(out, in, []byte("path"))
 
-       expected := fmt.Sprintf(`<script data-no-instant>document.write('<script src="/livereload.js?mindelay=10"></' + 'script>')</script>%s`, bodyEndTag)
+       expected := fmt.Sprintf(`<script data-no-instant>document.write('<script src="/livereload.js?port=1313&mindelay=10"></' + 'script>')</script>%s`, bodyEndTag)
        if string(out.Bytes()) != expected {
                t.Errorf("Expected %s got %s", expected, string(out.Bytes()))
        }