Skip to content

Add websocket support #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
porjo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add websocket support #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 40 additions & 18 deletions constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,47 @@ const (
ADD = "ADD"
REMOVE = "REMOVE"
RELOAD_JS = `(function () {
var added = false;
function add_js () {
if(added) { return; }
var js = document.createElement('script');
js.src = "http://{{.}}/_d/polling";
var scripts = document.getElementsByTagName('script'),
s = scripts[scripts.length - 1];
s.parentNode.insertBefore(js, s);
if(window.console && console.log) {
console.log("http-watcher reload connected");
}
added = true;
}
var added = false;
function add_js () {
if(added) { return; }

if (window.WebSocket){
var sock = null;
var wsuri = "ws://{{.}}/ws";

sock = new WebSocket(wsuri);

sock.onopen = function() {
console.log("http-watcher reload connected, websocket");
}
sock.onclose = function() {
console.log("http-watcher reload disconnected, websocket");
}

sock.onmessage = function(e) {
setTimeout(function() {
location.reload(true);
}, parseFloat(e.data));
}
} else {
var js = document.createElement('script');
js.src = "http://{{.}}/_d/polling";
var scripts = document.getElementsByTagName('script'),
s = scripts[scripts.length - 1];
s.parentNode.insertBefore(js, s);
if(window.console && console.log) {
console.log("http-watcher reload connected");
}
}
added = true;
}

setTimeout(function(){
setTimeout(add_js, 600);
window.onload = add_js;
}, 600)
})();`

setTimeout(function(){
setTimeout(add_js, 600);
window.onload = add_js;
}, 600)
})();`
DIR_HTML = `<!doctype html>
<html>
<head>
Expand Down
24 changes: 23 additions & 1 deletion http-watcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"bytes"
"flag"
"fmt"
"github.com/howeyc/fsnotify"
"io"
"log"
"mime"
Expand All @@ -21,6 +20,9 @@ import (
"sync"
"text/template"
"time"

"code.google.com/p/go.net/websocket"
"github.com/howeyc/fsnotify"
)

type Client struct {
Expand All @@ -39,6 +41,7 @@ type ReloadMux struct {
dirListTmpl *template.Template
docTmpl *template.Template
clients []Client
wsclients []*websocket.Conn
private bool
proxy int
monitor bool
Expand Down Expand Up @@ -287,6 +290,17 @@ func handler(w http.ResponseWriter, req *http.Request) {
}
}

func wshandler(ws *websocket.Conn) {
reloadCfg.mu.Lock()
reloadCfg.wsclients = append(reloadCfg.wsclients, ws)
reloadCfg.mu.Unlock()

// Wait until the client disconnects.
// We're not expecting the client to send real data to us
// so websocket.Read() can be used as a convenient way to block
ws.Read(nil)
}

func startMonitorFs() {
watcher, err := fsnotify.NewWatcher()
if err != nil {
Expand Down Expand Up @@ -346,6 +360,13 @@ func notifyBrowsers() {
c.buf.Flush()
}
reloadCfg.clients = make([]Client, 0)

for _, c := range reloadCfg.wsclients {
defer c.Close()
reload := fmt.Sprintf("%f*1000", reloadCfg.delay)
c.Write([]byte(reload))
}
reloadCfg.wsclients = make([]*websocket.Conn, 0)
}

// remove duplicate, and file name contains #
Expand Down Expand Up @@ -455,6 +476,7 @@ func main() {
go processFsEvents()
}
http.HandleFunc("/", handler)
http.Handle("/ws", websocket.Handler(wshandler))

int := ":" + strconv.Itoa(reloadCfg.port)
p := strconv.Itoa(reloadCfg.port)
Expand Down