Basic events interface

cmd/stevents/main.go

@@ -0,0 +1,54 @@
+package main
+
+import (
+	"encoding/json"
+	"flag"
+	"fmt"
+	"log"
+	"net/http"
+	"time"
+)
+
+type event struct {
+	ID   int
+	Type string
+	Time time.Time
+	Data map[string]interface{}
+}
+
+func main() {
+	target := flag.String("target", "localhost:8080", "Target Syncthing instance")
+	apikey := flag.String("apikey", "", "Syncthing API key")
+	flag.Parse()
+
+	if *apikey == "" {
+		log.Fatal("Must give -apikey argument")
+	}
+
+	since := 0
+	for {
+		req, err := http.NewRequest("GET", fmt.Sprintf("http://%s/rest/events?since=%d", *target, since), nil)
+		if err != nil {
+			log.Fatal(err)
+		}
+		req.Header.Set("X-API-Key", *apikey)
+		res, err := http.DefaultClient.Do(req)
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		var events []event
+		err = json.NewDecoder(res.Body).Decode(&events)
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		for _, event := range events {
+			log.Printf("%d: %v", event.ID, event.Type)
+			for k, v := range event.Data {
+				log.Printf("\t%s: %v", k, v)
+			}
+			since = event.ID
+		}
+	}
+}

cmd/syncthing/gui.go

@@ -18,6 +18,7 @@ import (
 	"path/filepath"
 	"reflect"
 	"runtime"
+	"strconv"
 	"strings"
 	"sync"
 	"time"
@@ -26,6 +27,7 @@ import (
 	"code.google.com/p/go.crypto/bcrypt"
 	"github.com/calmh/syncthing/auto"
 	"github.com/calmh/syncthing/config"
+	"github.com/calmh/syncthing/events"
 	"github.com/calmh/syncthing/logger"
 	"github.com/calmh/syncthing/model"
 	"github.com/vitrun/qart/qr"
@@ -43,6 +45,7 @@ var (
 	static       func(http.ResponseWriter, *http.Request, *log.Logger)
 	apiKey       string
 	modt         = time.Now().UTC().Format(http.TimeFormat)
+	eventSub     = events.NewBufferedSubscription(events.Default.Subscribe(events.AllEvents), 1000)
 )
 
 const (
@@ -98,6 +101,7 @@ func startGUI(cfg config.GUIConfiguration, assetDir string, m *model.Model) erro
 	getRestMux.HandleFunc("/rest/errors", restGetErrors)
 	getRestMux.HandleFunc("/rest/discovery", restGetDiscovery)
 	getRestMux.HandleFunc("/rest/report", withModel(m, restGetReport))
+	getRestMux.HandleFunc("/rest/events", restGetEvents)
 
 	// The POST handlers
 	postRestMux := http.NewServeMux()
@@ -414,6 +418,15 @@ func restGetReport(m *model.Model, w http.ResponseWriter, r *http.Request) {
 	json.NewEncoder(w).Encode(reportData(m))
 }
 
+func restGetEvents(w http.ResponseWriter, r *http.Request) {
+	qs := r.URL.Query()
+	ts := qs.Get("since")
+	since, _ := strconv.Atoi(ts)
+
+	w.Header().Set("Content-Type", "application/json; charset=utf-8")
+	json.NewEncoder(w).Encode(eventSub.Since(since, nil))
+}
+
 func getQR(w http.ResponseWriter, r *http.Request) {
 	r.ParseForm()
 	text := r.FormValue("text")

cmd/syncthing/main.go

@@ -28,6 +28,7 @@ import (
 
 	"github.com/calmh/syncthing/config"
 	"github.com/calmh/syncthing/discover"
+	"github.com/calmh/syncthing/events"
 	"github.com/calmh/syncthing/logger"
 	"github.com/calmh/syncthing/model"
 	"github.com/calmh/syncthing/osutil"
@@ -454,10 +455,21 @@ nextRepo:
 		}()
 	}
 
+	events.Default.Log(events.StartupComplete, nil)
+	go generateEvents()
+
 	<-stop
+
 	l.Okln("Exiting")
 }
 
+func generateEvents() {
+	for {
+		time.Sleep(300 * time.Second)
+		events.Default.Log(events.Ping, nil)
+	}
+}
+
 func waitForParentExit() {
 	l.Infoln("Waiting for parent to exit...")
 	// Wait for the listen address to become free, indicating that the parent has exited.
@@ -723,6 +735,10 @@ next:
 				protoConn := protocol.NewConnection(remoteID, conn, wr, m)
 
 				l.Infof("Established secure connection to %s at %v", remoteID, conn.RemoteAddr())
+				events.Default.Log(events.NodeConnected, map[string]string{
+					"id":   remoteID.String(),
+					"addr": conn.RemoteAddr().String(),
+				})
 
 				m.AddConnection(conn, protoConn)
 				continue next