diff --git a/inbucket.go b/inbucket.go index 9934084..506ace4 100644 --- a/inbucket.go +++ b/inbucket.go @@ -97,7 +97,7 @@ func main() { } // Create message hub - msgHub := msghub.New(rootCtx, 100) + msgHub := msghub.New(rootCtx, 30) // Grab our datastore ds := smtpd.DefaultFileDataStore() diff --git a/themes/bootstrap/public/inbucket.css b/themes/bootstrap/public/inbucket.css index 0da5a2f..63d80bb 100644 --- a/themes/bootstrap/public/inbucket.css +++ b/themes/bootstrap/public/inbucket.css @@ -81,3 +81,8 @@ table.metrics { width: 200px; } +/* Monitor */ +#monitor-message-list td { + cursor: pointer; + font-size: 12px; +} diff --git a/themes/bootstrap/public/monitor.js b/themes/bootstrap/public/monitor.js new file mode 100644 index 0000000..6a975ca --- /dev/null +++ b/themes/bootstrap/public/monitor.js @@ -0,0 +1,39 @@ +var baseURL = window.location.protocol + '//' + window.location.host; + +function startMonitor() { + $.addTemplateFormatter({ + "date": function(value, template) { + return moment(value).calendar(); + }, + "subject": function(value, template) { + if (value == null || value.length == 0) { + return "(No Subject)"; + } + return value; + } + }); + + var uri = '/api/v1/monitor/all/messages' + var l = window.location; + var url = ((l.protocol === "https:") ? "wss://" : "ws://") + l.host + uri + var ws = new WebSocket(url); + + ws.addEventListener('message', function (e) { + var msg = JSON.parse(e.data); + msg['href'] = '/mailbox?name=' + msg.mailbox + '&id=' + msg.id; + $('#monitor-message-list').loadTemplate( + $('#message-template'), + msg, + { append: true }); + }); +} + +function messageClick(node) { + var href = node.attributes['href'].value; + var url = baseURL + href; + window.location.assign(url); +} + +function clearClick() { + $('#monitor-message-list').empty(); +} diff --git a/themes/bootstrap/templates/_base.html b/themes/bootstrap/templates/_base.html index 1fecc90..e7be06b 100644 --- a/themes/bootstrap/templates/_base.html +++ b/themes/bootstrap/templates/_base.html @@ -48,7 +48,8 @@ {{end}} - + +
diff --git a/themes/bootstrap/templates/root/monitor.html b/themes/bootstrap/templates/root/monitor.html new file mode 100644 index 0000000..54cebaf --- /dev/null +++ b/themes/bootstrap/templates/root/monitor.html @@ -0,0 +1,51 @@ +{{define "title"}}Inbucket Monitor{{end}} + +{{define "script"}} + + + +{{end}} + +{{define "menu"}} + +{{end}} + +{{define "content"}} +

Inbucket Monitor

+ +
+ +
+ +

Messages will be listed here shortly after delivery.

+ +
+ + + + + + + + + + +
DateFromMailboxSubject
+
+{{end}} + diff --git a/webui/root_controller.go b/webui/root_controller.go index 3f70d7c..ef156be 100644 --- a/webui/root_controller.go +++ b/webui/root_controller.go @@ -23,6 +23,13 @@ func RootIndex(w http.ResponseWriter, req *http.Request, ctx *httpd.Context) (er }) } +// RootMonitor serves the Inbucket monitor page +func RootMonitor(w http.ResponseWriter, req *http.Request, ctx *httpd.Context) (err error) { + return httpd.RenderTemplate("root/monitor.html", w, map[string]interface{}{ + "ctx": ctx, + }) +} + // RootStatus serves the Inbucket status page func RootStatus(w http.ResponseWriter, req *http.Request, ctx *httpd.Context) (err error) { smtpListener := fmt.Sprintf("%s:%d", config.GetSMTPConfig().IP4address.String(), diff --git a/webui/routes.go b/webui/routes.go index 8da346a..9c49543 100644 --- a/webui/routes.go +++ b/webui/routes.go @@ -8,14 +8,26 @@ import ( // SetupRoutes populates routes for the webui into the provided Router func SetupRoutes(r *mux.Router) { - r.Path("/").Handler(httpd.Handler(RootIndex)).Name("RootIndex").Methods("GET") - r.Path("/status").Handler(httpd.Handler(RootStatus)).Name("RootStatus").Methods("GET") - r.Path("/link/{name}/{id}").Handler(httpd.Handler(MailboxLink)).Name("MailboxLink").Methods("GET") - r.Path("/mailbox").Handler(httpd.Handler(MailboxIndex)).Name("MailboxIndex").Methods("GET") - r.Path("/mailbox/{name}").Handler(httpd.Handler(MailboxList)).Name("MailboxList").Methods("GET") - r.Path("/mailbox/{name}/{id}").Handler(httpd.Handler(MailboxShow)).Name("MailboxShow").Methods("GET") - r.Path("/mailbox/{name}/{id}/html").Handler(httpd.Handler(MailboxHTML)).Name("MailboxHtml").Methods("GET") - r.Path("/mailbox/{name}/{id}/source").Handler(httpd.Handler(MailboxSource)).Name("MailboxSource").Methods("GET") - r.Path("/mailbox/dattach/{name}/{id}/{num}/{file}").Handler(httpd.Handler(MailboxDownloadAttach)).Name("MailboxDownloadAttach").Methods("GET") - r.Path("/mailbox/vattach/{name}/{id}/{num}/{file}").Handler(httpd.Handler(MailboxViewAttach)).Name("MailboxViewAttach").Methods("GET") + r.Path("/").Handler( + httpd.Handler(RootIndex)).Name("RootIndex").Methods("GET") + r.Path("/monitor").Handler( + httpd.Handler(RootMonitor)).Name("RootMonitor").Methods("GET") + r.Path("/status").Handler( + httpd.Handler(RootStatus)).Name("RootStatus").Methods("GET") + r.Path("/link/{name}/{id}").Handler( + httpd.Handler(MailboxLink)).Name("MailboxLink").Methods("GET") + r.Path("/mailbox").Handler( + httpd.Handler(MailboxIndex)).Name("MailboxIndex").Methods("GET") + r.Path("/mailbox/{name}").Handler( + httpd.Handler(MailboxList)).Name("MailboxList").Methods("GET") + r.Path("/mailbox/{name}/{id}").Handler( + httpd.Handler(MailboxShow)).Name("MailboxShow").Methods("GET") + r.Path("/mailbox/{name}/{id}/html").Handler( + httpd.Handler(MailboxHTML)).Name("MailboxHtml").Methods("GET") + r.Path("/mailbox/{name}/{id}/source").Handler( + httpd.Handler(MailboxSource)).Name("MailboxSource").Methods("GET") + r.Path("/mailbox/dattach/{name}/{id}/{num}/{file}").Handler( + httpd.Handler(MailboxDownloadAttach)).Name("MailboxDownloadAttach").Methods("GET") + r.Path("/mailbox/vattach/{name}/{id}/{num}/{file}").Handler( + httpd.Handler(MailboxViewAttach)).Name("MailboxViewAttach").Methods("GET") }