diff --git a/examples/web-example-eventsource/example-ssh.html b/examples/web-example-eventsource/example-ssh.html index db1acdae..e558ef12 100644 --- a/examples/web-example-eventsource/example-ssh.html +++ b/examples/web-example-eventsource/example-ssh.html @@ -3,6 +3,7 @@ ntfy.sh: EventSource Example + + + +

ntfy.sh: EventSource Example

+

+ This is an example showing how to use ntfy.sh with + EventSource.
+ This example doesn't need a server. You can just save the HTML page and run it from anywhere. +

+ +

Log:

+
+ + + + + diff --git a/server/index.gohtml b/server/index.gohtml index 1c4ad204..a98ab62e 100644 --- a/server/index.gohtml +++ b/server/index.gohtml @@ -38,7 +38,7 @@

ntfy
ntfy.sh | simple HTTP-based pub-sub

Ntfy (pronounce: notify) is a simple HTTP-based pub-sub notification service. - It allows you to send notifications to your phone or desktop via scripts from any computer, + It allows you to send notifications to your phone or desktop via scripts from any computer, entirely without signup or cost. It's also open source if you want to run your own.

@@ -53,9 +53,9 @@

- There are many ways to use Ntfy. You can send yourself messages for all sorts of things: When a long process finishes or fails (a backup, a long rsync job, ...), + There are many ways to use Ntfy. You can send yourself messages for all sorts of things: When a long process finishes or fails, or to notify yourself when somebody logs into your server(s). Or you may want to use it in your own app to distribute messages to subscribed clients. - Endless possibilities 😀. Be sure to check out the example on GitHub! + Endless possibilities 😀. Be sure to check out the examples below.

Publishing messages

@@ -104,16 +104,21 @@ -

Subscribe via Android App

+

Subscribe from your phone

You can use the Ntfy Android App to receive notifications directly on your phone. Just like the server, this app is also open source. + Since I don't have an iPhone or a Mac, I didn't make an iOS app yet. I'd be awesome if someone else could help out. +

+

+ +

Subscribe via your app, or via the CLI

Using EventSource in JS, you can consume - notifications like this (see full example): + notifications like this (see live example):

const eventSource = new EventSource('https://ntfy.sh/mytopic/sse');
@@ -149,19 +154,12 @@ $ curl -s ntfy.sh/mytopic/raw

- This is a notification - -

- Here's an example of how to use this endpoint to send desktop notifications for every incoming message: -

- - while read msg; do
-   [ -n "$msg" ] && notify-send "$msg"
- done < <(stdbuf -i0 -o0 curl -s ntfy.sh/mytopic/raw) + This is a notification
+ And another one with a smiley face 😀

Other features

-

Fetching cached messages

+

Fetching cached messages (since=)

Messages are cached on disk for {{.CacheDuration}} to account for network interruptions of subscribers. You can read back what you missed by using the since= query parameter. It takes either a @@ -172,7 +170,7 @@ curl -s "ntfy.sh/mytopic/json?since=10m" -

Fetching cached messages

+

Polling (poll=1)

You can also just poll for messages if you don't like the long-standing connection using the poll=1 query parameter. The connection will end after all available messages have been read. This parameter can be @@ -182,7 +180,7 @@ curl -s "ntfy.sh/mytopic/json?poll=1" -

Subscribing to multiple topics

+

Subscribing to multiple topics (topic1,topic2,...)

It's possible to subscribe to multiple topics in one HTTP call by providing a comma-separated list of topics in the URL. This allows you to reduce the number of connections you have to maintain: @@ -194,6 +192,65 @@ {"id":"Cm02DsxUHb","time":1637182643,"event":"message","topic":"mytopic2","message":"for topic 2"} +

Examples

+

+ There are a million ways to use Ntfy, but here are some inspirations. I try to collect + examples on GitHub, so be sure to check + those out, too. +

+ +

Example: A long process is done: backups, copying data, pipelines, ...

+

+ I started adding notifications pretty much all of my scripts. Typically, I just chain the curl call + directly to the command I'm running. The following example will either send Laptop backup succeeded + or ⚠️ Laptop backup failed directly to my phone: +

+ + rsync -a root@laptop /backups/laptop \
+   && zfs snapshot ... \
+   && curl -d "Laptop backup succeeded" ntfy.sh/backups \
+   || echo -en "\u26A0\uFE0F Laptop backup failed" | curl -sT- ntfy.sh/backups + + +

Example: Server-sent messages in your web app

+

+ Just as you can subscribe to topics in this Web UI, you can use Ntfy in your own + web application. Check out the live example or just look the source of this page. +

+ +

Example: Notify on SSH login

+

+ Years ago my home server was broken into. That shook me hard, so every time someone logs into any machine that I + own, I now message myself. Here's an example of how to use PAM + to notify yourself on SSH login. +

+

+ /etc/pam.d/sshd (at the end of the file): +

+ + session optional pam_exec.so /usr/local/bin/ntfy-ssh-login.sh + +

+ /usr/local/bin/ntfy-ssh-login.sh: +

+ + #!/bin/bash
+ if [ "${PAM_TYPE}" = "open_session" ]; then
+   echo -en "\u26A0\uFE0F SSH login: ${PAM_USER} from ${PAM_RHOST}" | curl -T- ntfy.sh/alerts
+ fi + + +

Example: Collect data from multiple machines

+

+ The other day I was running tasks on 20 servers and I wanted to collect the interim results + as a CSV in one place. Here's the script I wrote: +

+ + while read result; do
+   [ -n "$result" ] && echo "result" >> results.csv
+ done < <(stdbuf -i0 -o0 curl -s ntfy.sh/results/raw) + +

FAQ

Isn't this like ...?
@@ -225,6 +282,13 @@ client network disruptions.

+

+ Can I self-host it?
+ Yes. The server (including this Web UI) can be self-hosted, and the Android app supports adding topics from + your own server as well. There are install instructions + on GitHub. +

+

Why is Firebase used?
In addition to caching messages locally and delivering them to long-polling subscribers, all messages are also @@ -232,7 +296,13 @@ is to facilitate instant notifications on Android.

-

Privacy policy

+

+ Why is there no iOS app (yet)?
+ I don't have an iPhone or a Mac, so I didn't make an iOS app yet. I'd be awesome if + someone else could help out. +

+ +

Privacy policy

Neither the server nor the app record any personal information, or share any of the messages and topics with any outside service. All data is exclusively used to make the service function properly. The one exception diff --git a/server/server.go b/server/server.go index 71ab024c..07b9973c 100644 --- a/server/server.go +++ b/server/server.go @@ -88,6 +88,9 @@ var ( indexSource string indexTemplate = template.Must(template.New("index").Parse(indexSource)) + //go:embed "example.html" + exampleSource string + //go:embed static webStaticFs embed.FS @@ -188,6 +191,8 @@ func (s *Server) handle(w http.ResponseWriter, r *http.Request) { func (s *Server) handleInternal(w http.ResponseWriter, r *http.Request) error { if r.Method == http.MethodGet && (r.URL.Path == "/" || topicRegex.MatchString(r.URL.Path)) { return s.handleHome(w, r) + } else if r.Method == http.MethodGet && r.URL.Path == "/example.html" { + return s.handleExample(w, r) } else if r.Method == http.MethodHead && r.URL.Path == "/" { return s.handleEmpty(w, r) } else if r.Method == http.MethodGet && staticRegex.MatchString(r.URL.Path) { @@ -217,6 +222,11 @@ func (s *Server) handleEmpty(w http.ResponseWriter, r *http.Request) error { return nil } +func (s *Server) handleExample(w http.ResponseWriter, r *http.Request) error { + _, err := io.WriteString(w, exampleSource) + return err +} + func (s *Server) handleStatic(w http.ResponseWriter, r *http.Request) error { http.FileServer(http.FS(webStaticFs)).ServeHTTP(w, r) return nil diff --git a/server/static/css/app.css b/server/static/css/app.css index 272263fc..d7ce0407 100644 --- a/server/static/css/app.css +++ b/server/static/css/app.css @@ -28,13 +28,13 @@ h1 { } h2 { - margin-top: 20px; + margin-top: 30px; margin-bottom: 5px; font-size: 1.8em; } h3 { - margin-top: 20px; + margin-top: 25px; margin-bottom: 5px; font-size: 1.3em; } diff --git a/server/static/img/badge-appstore.png b/server/static/img/badge-appstore.png new file mode 100644 index 00000000..0b4ce1c0 Binary files /dev/null and b/server/static/img/badge-appstore.png differ diff --git a/server/static/img/badge-googleplay.png b/server/static/img/badge-googleplay.png new file mode 100644 index 00000000..36036d8b Binary files /dev/null and b/server/static/img/badge-googleplay.png differ diff --git a/server/static/js/app.js b/server/static/js/app.js index f0530533..11982f76 100644 --- a/server/static/js/app.js +++ b/server/static/js/app.js @@ -338,6 +338,7 @@ if (match) { } } +// Add anchor links document.querySelectorAll('.anchor').forEach((el) => { if (el.hasAttribute('id')) { const id = el.getAttribute('id');