From 03c35d64469be1ec63e9a4bcb3595f2f0972e9a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20Schw=C3=B6rer?= Date: Mon, 21 Nov 2022 22:52:44 +0100 Subject: [PATCH] update HTML with new methods --- server/Makefile | 10 +-- server/README.md | 4 +- server/api/handler/api.go | 3 + server/api/handler/message.go | 11 +-- server/api/handler/website.go | 43 +++++++--- server/config.go | 51 +++++++----- server/models/user.go | 4 + server/swagger/swagger.json | 30 ++----- server/swagger/swagger.yaml | 26 ++---- server/website/api.html | 25 +++--- server/website/api_more.html | 129 +++++++---------------------- server/website/css/style.css | 54 +++++++++++- server/website/index.html | 17 ++-- server/website/js/logic.js | 52 ++++++------ server/website/js/message_sent.js | 5 +- server/website/message_sent.html | 13 +-- server/website/scn_send.html | 131 ++++++++++++++++++++++++++++++ 17 files changed, 374 insertions(+), 234 deletions(-) create mode 100644 server/website/scn_send.html diff --git a/server/Makefile b/server/Makefile index 9962ec1..2cbb343 100644 --- a/server/Makefile +++ b/server/Makefile @@ -5,7 +5,7 @@ PORT=9090 NAMESPACE=$(shell git rev-parse --abbrev-ref HEAD) HASH=$(shell git rev-parse HEAD) -build: +build: swagger fmt rm -f ./_build/scn_backend CGO_ENABLED=1 go build -v -o _build/scn_backend -tags timetzdata ./cmd/scnserver @@ -13,7 +13,7 @@ run: build mkdir -p .run-data _build/scn_backend -docker: +docker: build [ ! -f "DOCKER_GIT_INFO" ] || rm DOCKER_GIT_INFO git rev-parse --abbrev-ref HEAD >> DOCKER_GIT_INFO git rev-parse HEAD >> DOCKER_GIT_INFO @@ -33,7 +33,7 @@ swagger: which swag || go install github.com/swaggo/swag/cmd/swag@latest swag init -generalInfo api/router.go --output ./swagger/ --outputTypes "json,yaml" -run-docker-local: +run-docker-local: docker mkdir -p .run-data docker run --rm \ --init \ @@ -42,7 +42,7 @@ run-docker-local: --publish "8080:80" \ $(DOCKER_NAME):latest -inspect-docker: +inspect-docker: docker mkdir -p .run-data docker run -ti \ --rm \ @@ -50,7 +50,7 @@ inspect-docker: $(DOCKER_NAME):latest \ bash -push-docker: +push-docker: docker docker image push "$(DOCKER_REPO)/$(DOCKER_NAME):$(HASH)" docker image push "$(DOCKER_REPO)/$(DOCKER_NAME):$(NAMESPACE)-latest" docker image push "$(DOCKER_REPO)/$(DOCKER_NAME):latest" diff --git a/server/README.md b/server/README.md index 7017727..8e48ea2 100644 --- a/server/README.md +++ b/server/README.md @@ -2,6 +2,8 @@ //TODO + - remove fcm/goog_api keys from repo (and invalidate them !!) + - migration script for existing data - ack/read deliveries && return ack-count (? or not, how to query?) @@ -9,8 +11,8 @@ - verify pro_token - full-text-search: https://www.sqlite.org/fts5.html#contentless_tables - - update html (--channel, api doku, better send route, etc) - dark mode toggle for html + - app-store link in HTML - deploy diff --git a/server/api/handler/api.go b/server/api/handler/api.go index c0712f8..50291e8 100644 --- a/server/api/handler/api.go +++ b/server/api/handler/api.go @@ -1356,6 +1356,9 @@ func (h APIHandler) CreateMessage(g *gin.Context) ginresp.HTTPResponse { if b.Content != nil && len(*b.Content) > user.MaxContentLength() { return ginresp.SendAPIError(g, 400, apierr.CONTENT_TOO_LONG, 104, fmt.Sprintf("Content too long (%d characters; max := %d characters)", len(*b.Content), user.MaxContentLength()), nil) } + if len(channelName) > user.MaxChannelNameLength() { + return ginresp.SendAPIError(g, 400, apierr.CONTENT_TOO_LONG, 106, fmt.Sprintf("Channel too long (max %d characters)", user.MaxChannelNameLength()), nil) + } if b.UserMessageID != nil { msg, err := h.database.GetMessageByUserMessageID(ctx, *b.UserMessageID) diff --git a/server/api/handler/message.go b/server/api/handler/message.go index 590d75e..a620de6 100644 --- a/server/api/handler/message.go +++ b/server/api/handler/message.go @@ -44,7 +44,6 @@ func NewMessageHandler(app *logic.Application) MessageHandler { // @Failure 400 {object} ginresp.apiError // @Failure 401 {object} ginresp.apiError // @Failure 403 {object} ginresp.apiError -// @Failure 404 {object} ginresp.apiError // @Failure 500 {object} ginresp.apiError // // @Router /send.php [POST] @@ -93,10 +92,9 @@ func (h MessageHandler) SendMessageCompat(g *gin.Context) ginresp.HTTPResponse { // // @Success 200 {object} handler.sendMessageInternal.response // @Failure 400 {object} ginresp.apiError -// @Failure 401 {object} ginresp.apiError -// @Failure 403 {object} ginresp.apiError -// @Failure 404 {object} ginresp.apiError -// @Failure 500 {object} ginresp.apiError +// @Failure 401 {object} ginresp.apiError "The user_id was not found or the user_key is wrong" +// @Failure 403 {object} ginresp.apiError "The user has exceeded its daily quota - wait 24 hours or upgrade your account" +// @Failure 500 {object} ginresp.apiError "An internal server error occurred - try again later" // // @Router / [POST] // @Router /send [POST] @@ -212,6 +210,9 @@ func (h MessageHandler) sendMessageInternal(g *gin.Context, ctx *logic.AppContex if Content != nil && len(*Content) > user.MaxContentLength() { return ginresp.SendAPIError(g, 400, apierr.CONTENT_TOO_LONG, 104, fmt.Sprintf("Content too long (%d characters; max := %d characters)", len(*Content), user.MaxContentLength()), nil) } + if len(channelName) > user.MaxChannelNameLength() { + return ginresp.SendAPIError(g, 400, apierr.CONTENT_TOO_LONG, 106, fmt.Sprintf("Channel too long (max %d characters)", user.MaxChannelNameLength()), nil) + } if UserMessageID != nil { msg, err := h.database.GetMessageByUserMessageID(ctx, *UserMessageID) diff --git a/server/api/handler/website.go b/server/api/handler/website.go index b93d539..0df6148 100644 --- a/server/api/handler/website.go +++ b/server/api/handler/website.go @@ -4,43 +4,47 @@ import ( "blackforestbytes.com/simplecloudnotifier/common/ginresp" "blackforestbytes.com/simplecloudnotifier/logic" "blackforestbytes.com/simplecloudnotifier/website" + "errors" "github.com/gin-gonic/gin" "net/http" + "regexp" "strings" ) type WebsiteHandler struct { - app *logic.Application + app *logic.Application + rexTemplate *regexp.Regexp } func NewWebsiteHandler(app *logic.Application) WebsiteHandler { return WebsiteHandler{ - app: app, + app: app, + rexTemplate: regexp.MustCompile("{{template\\|[A-Za-z0-9_\\-.]+}}"), } } func (h WebsiteHandler) Index(g *gin.Context) ginresp.HTTPResponse { - return h.serveAsset(g, "index.html") + return h.serveAsset(g, "index.html", true) } func (h WebsiteHandler) APIDocs(g *gin.Context) ginresp.HTTPResponse { - return h.serveAsset(g, "api.html") + return h.serveAsset(g, "api.html", true) } func (h WebsiteHandler) APIDocsMore(g *gin.Context) ginresp.HTTPResponse { - return h.serveAsset(g, "api_more.html") + return h.serveAsset(g, "api_more.html", true) } func (h WebsiteHandler) MessageSent(g *gin.Context) ginresp.HTTPResponse { - return h.serveAsset(g, "message_sent.html") + return h.serveAsset(g, "message_sent.html", true) } func (h WebsiteHandler) FaviconIco(g *gin.Context) ginresp.HTTPResponse { - return h.serveAsset(g, "favicon.ico") + return h.serveAsset(g, "favicon.ico", false) } func (h WebsiteHandler) FaviconPNG(g *gin.Context) ginresp.HTTPResponse { - return h.serveAsset(g, "favicon.png") + return h.serveAsset(g, "favicon.png", false) } func (h WebsiteHandler) Javascript(g *gin.Context) ginresp.HTTPResponse { @@ -53,7 +57,7 @@ func (h WebsiteHandler) Javascript(g *gin.Context) ginresp.HTTPResponse { return ginresp.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) } - return h.serveAsset(g, "js/"+u.Filename) + return h.serveAsset(g, "js/"+u.Filename, false) } func (h WebsiteHandler) CSS(g *gin.Context) ginresp.HTTPResponse { @@ -66,15 +70,32 @@ func (h WebsiteHandler) CSS(g *gin.Context) ginresp.HTTPResponse { return ginresp.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) } - return h.serveAsset(g, "css/"+u.Filename) + return h.serveAsset(g, "css/"+u.Filename, false) } -func (h WebsiteHandler) serveAsset(g *gin.Context, fn string) ginresp.HTTPResponse { +func (h WebsiteHandler) serveAsset(g *gin.Context, fn string, repl bool) ginresp.HTTPResponse { data, err := website.Assets.ReadFile(fn) if err != nil { return ginresp.Status(http.StatusNotFound) } + if repl { + failed := false + data = h.rexTemplate.ReplaceAllFunc(data, func(match []byte) []byte { + prefix := len("{{template|") + suffix := len("}}") + fnSub := match[prefix : len(match)-suffix] + subdata, err := website.Assets.ReadFile(string(fnSub)) + if err != nil { + failed = true + } + return subdata + }) + if failed { + return ginresp.InternalError(errors.New("template replacement failed")) + } + } + mime := "text/plain" lowerFN := strings.ToLower(fn) diff --git a/server/config.go b/server/config.go index 4078f91..e8bf45d 100644 --- a/server/config.go +++ b/server/config.go @@ -1,6 +1,7 @@ package server import ( + "fmt" "github.com/rs/zerolog/log" "os" "time" @@ -14,8 +15,8 @@ type Config struct { DBFile string RequestTimeout time.Duration ReturnRawErrors bool - FirebaseProjectID string FirebaseTokenURI string + FirebaseProjectID string FirebasePrivKeyID string FirebaseClientMail string FirebasePrivateKey string @@ -31,11 +32,11 @@ var configLocHost = Config{ DBFile: ".run-data/db.sqlite3", RequestTimeout: 16 * time.Second, ReturnRawErrors: true, - FirebaseProjectID: "simplecloudnotifier-ea7ef", FirebaseTokenURI: "https://oauth2.googleapis.com/token", - FirebasePrivKeyID: "5bfab19fca25034e87c5b3bd1a4334499d2d1f85", - FirebaseClientMail: "firebase-adminsdk-42grv@simplecloudnotifier-ea7ef.iam.gserviceaccount.com", - FirebasePrivateKey: "-----BEGIN PRIVATE KEY-----\nMIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQD2NWOQDcalRdkp\nHtQHABLlu3GMBQBJrGiCxzOZhi/lLwrw2MJEmg1VFz6TVkX2z3SCzXCPOgGriM70\nuWCNLyZQvUng7u6/WH9hlpCg0vJpkw6BvOBt1zYu3gbb5M0SKEOR+lDVccEjAnT4\nexebXdJHJcbaYAcPnBQ9tgP+cozQBnr2EfxYL0bGMgiH9fErJSGMBDFI996uUW9a\nbtfkZ/XpZqYAvyGQMEjknGnQ8t8PHAnsS9dc1PXSWfBvz07ba3fkypWcpTsIYUiZ\nSpwTLV8awihKHJuphoTWb4x6p/ijop05qr1p3fe8gZd9qOGgALe+JT4IBLgNYKrP\nLMSKH3TdAgMBAAECggEAdFcWDOP1kfNHgl7G4efvBg9kwD08vZNybxmiEFGQIEPy\nb4x9f90rn6G0N/r0ZIPzEjvxjDxkvaGP6aQPM6er+0r2tgsxVcmDp6F2Bgin86tB\nl5ygkEa5m7vekdmz7XiJNVmLCNEP6nMmwqOnrArRaj03kcj+jSm7hs2TZZDLaSA5\nf+2q7h0jaU7Nm0ZwCNJqfPJEGdu1J3fR29Ej0rI8N0w/BuYRet1VYDO09lquqOPS\n0WirOOWV6eyqijqRT+RCt0vVzAppS6guhN7J7RS0V9GLJ/13sdvHuJy/WTjBb7gQ\na6QTo8D3yYF+cn3+0BmgP55uW7N6tsYwXIRZcTI3IQKBgQD+tDKMx0puZu+8zTX9\nC2oHSb4Frl2xq17ZpbkfFmOBPWfQbAHNiQTUoQlzCOQM6QejykXFvfsddP7EY2tL\npgLUrBh81wSCAOOo19vYwQB3YKa5ZZucKxh2VxFSefL/+BYHijFb0mWBj5HmqWS6\n7l6IYT3L04aRK9kxj0Cg6L/z6wKBgQD3dh/kQlPemfdxRpZUJ6WEE5x3Bv7WjLop\nnWgE02Pk8+DB+s50GD3nOR276ADCYS6OkBsgfMkwhhKWZigiEoK9DMul5n587jc9\no5AalZN3IbBGAoXk+u3g1GC9bOY3454K6IJyhehDTImEFyfm00qfUL8fMNcdEx8O\nnwxtyRawVwKBgGqsnd9IOGw0wIOajtoERcv3npZSiPs4guk092uFvPcL+MbZ9YdX\ns6Y6K/L57klZ79ExjjdbcijML0ehO/ba+KSJz1e51jF8ndzBS1pkuwVEfY94dsvZ\nYM1vednJKXT7On696h5C6DBzKPAqUf3Yh88mqvMLDHkQnE6daLv7vykxAoGAOPmA\ndDx1NO48E1+OIwgRyqv9PUZmDB3Qit5L4biN6lvgJqlJOV+PeRokZ2wOKLLZVkeF\nh2BTrhFgXDJfESEz6rT0eljsTHVIUK/E8On5Ttd5z1SrYUII3NfpAhP9mWaVr6tC\nxX1hMYWAr+Ho9PM23iFoL5U+IdqSLvqdkPVYfPcCgYB1ANKNYPIJNx/wLxYWNS0r\nI98HwKfv2TxxE/l+2459NMMHY5wlpFl7MNoeK2SdY+ghWPlxC6u5Nxpnk+bZ8TJe\np7U2nY0SQDLCmPgGWs3KBb/zR49X2b7JS3CXXqQSrLxBe2phZg6kE5nB6NPUDc/i\n6WG8tG20rCfgwlXeXl0+Ow==\n-----END PRIVATE KEY-----\n", + FirebaseProjectID: "", + FirebasePrivKeyID: "", + FirebaseClientMail: "", + FirebasePrivateKey: "", } var configLocDocker = Config{ @@ -46,11 +47,11 @@ var configLocDocker = Config{ DBFile: "/data/scn_docker.sqlite3", RequestTimeout: 16 * time.Second, ReturnRawErrors: true, - FirebaseProjectID: "simplecloudnotifier-ea7ef", FirebaseTokenURI: "https://oauth2.googleapis.com/token", - FirebasePrivKeyID: "5bfab19fca25034e87c5b3bd1a4334499d2d1f85", - FirebaseClientMail: "firebase-adminsdk-42grv@simplecloudnotifier-ea7ef.iam.gserviceaccount.com", - FirebasePrivateKey: "TODO", + FirebaseProjectID: "", + FirebasePrivKeyID: "", + FirebaseClientMail: "", + FirebasePrivateKey: "", } var configDev = Config{ @@ -61,11 +62,11 @@ var configDev = Config{ DBFile: "/data/scn.sqlite3", RequestTimeout: 16 * time.Second, ReturnRawErrors: true, - FirebaseProjectID: "simplecloudnotifier-ea7ef", FirebaseTokenURI: "https://oauth2.googleapis.com/token", - FirebasePrivKeyID: "5bfab19fca25034e87c5b3bd1a4334499d2d1f85", - FirebaseClientMail: "firebase-adminsdk-42grv@simplecloudnotifier-ea7ef.iam.gserviceaccount.com", - FirebasePrivateKey: "TODO", + FirebaseProjectID: confEnv("FB_PROJECTID"), + FirebasePrivKeyID: confEnv("FB_PRIVATEKEYID"), + FirebaseClientMail: confEnv("FB_CLIENTEMAIL"), + FirebasePrivateKey: confEnv("FB_PRIVATEKEY"), } var configStag = Config{ @@ -76,11 +77,11 @@ var configStag = Config{ DBFile: "/data/scn.sqlite3", RequestTimeout: 16 * time.Second, ReturnRawErrors: true, - FirebaseProjectID: "simplecloudnotifier-ea7ef", FirebaseTokenURI: "https://oauth2.googleapis.com/token", - FirebasePrivKeyID: "5bfab19fca25034e87c5b3bd1a4334499d2d1f85", - FirebaseClientMail: "firebase-adminsdk-42grv@simplecloudnotifier-ea7ef.iam.gserviceaccount.com", - FirebasePrivateKey: "TODO", + FirebaseProjectID: confEnv("FB_PROJECTID"), + FirebasePrivKeyID: confEnv("FB_PRIVATEKEYID"), + FirebaseClientMail: confEnv("FB_CLIENTEMAIL"), + FirebasePrivateKey: confEnv("FB_PRIVATEKEY"), } var configProd = Config{ @@ -91,11 +92,11 @@ var configProd = Config{ DBFile: "/data/scn.sqlite3", RequestTimeout: 16 * time.Second, ReturnRawErrors: false, - FirebaseProjectID: "simplecloudnotifier-ea7ef", FirebaseTokenURI: "https://oauth2.googleapis.com/token", - FirebasePrivKeyID: "5bfab19fca25034e87c5b3bd1a4334499d2d1f85", - FirebaseClientMail: "firebase-adminsdk-42grv@simplecloudnotifier-ea7ef.iam.gserviceaccount.com", - FirebasePrivateKey: "TODO", + FirebaseProjectID: confEnv("FB_PROJECTID"), + FirebasePrivKeyID: confEnv("FB_PRIVATEKEYID"), + FirebaseClientMail: confEnv("FB_CLIENTEMAIL"), + FirebasePrivateKey: confEnv("FB_PRIVATEKEY"), } var allConfig = []Config{ @@ -118,6 +119,14 @@ func getConfig(ns string) (Config, bool) { return Config{}, false } +func confEnv(key string) string { + if v, ok := os.LookupEnv(key); ok { + return v + } else { + panic(fmt.Sprintf("Missing required environment variable '%s'", key)) + } +} + func init() { ns := os.Getenv("CONF_NS") diff --git a/server/models/user.go b/server/models/user.go index 6507f86..25f085a 100644 --- a/server/models/user.go +++ b/server/models/user.go @@ -79,6 +79,10 @@ func (u User) DefaultChannel() string { return "main" } +func (u User) MaxChannelNameLength() int { + return 120 +} + type UserJSON struct { UserID UserID `json:"user_id"` Username *string `json:"username"` diff --git a/server/swagger/swagger.json b/server/swagger/swagger.json index 97274d1..a47740c 100644 --- a/server/swagger/swagger.json +++ b/server/swagger/swagger.json @@ -127,25 +127,19 @@ } }, "401": { - "description": "Unauthorized", + "description": "The user_id was not found or the user_key is wrong", "schema": { "$ref": "#/definitions/ginresp.apiError" } }, "403": { - "description": "Forbidden", - "schema": { - "$ref": "#/definitions/ginresp.apiError" - } - }, - "404": { - "description": "Not Found", + "description": "The user has exceeded its daily quota - wait 24 hours or upgrade your account", "schema": { "$ref": "#/definitions/ginresp.apiError" } }, "500": { - "description": "Internal Server Error", + "description": "An internal server error occurred - try again later", "schema": { "$ref": "#/definitions/ginresp.apiError" } @@ -1871,25 +1865,19 @@ } }, "401": { - "description": "Unauthorized", + "description": "The user_id was not found or the user_key is wrong", "schema": { "$ref": "#/definitions/ginresp.apiError" } }, "403": { - "description": "Forbidden", - "schema": { - "$ref": "#/definitions/ginresp.apiError" - } - }, - "404": { - "description": "Not Found", + "description": "The user has exceeded its daily quota - wait 24 hours or upgrade your account", "schema": { "$ref": "#/definitions/ginresp.apiError" } }, "500": { - "description": "Internal Server Error", + "description": "An internal server error occurred - try again later", "schema": { "$ref": "#/definitions/ginresp.apiError" } @@ -1999,12 +1987,6 @@ "$ref": "#/definitions/ginresp.apiError" } }, - "404": { - "description": "Not Found", - "schema": { - "$ref": "#/definitions/ginresp.apiError" - } - }, "500": { "description": "Internal Server Error", "schema": { diff --git a/server/swagger/swagger.yaml b/server/swagger/swagger.yaml index 4051d90..8997793 100644 --- a/server/swagger/swagger.yaml +++ b/server/swagger/swagger.yaml @@ -514,19 +514,16 @@ paths: schema: $ref: '#/definitions/ginresp.apiError' "401": - description: Unauthorized + description: The user_id was not found or the user_key is wrong schema: $ref: '#/definitions/ginresp.apiError' "403": - description: Forbidden - schema: - $ref: '#/definitions/ginresp.apiError' - "404": - description: Not Found + description: The user has exceeded its daily quota - wait 24 hours or upgrade + your account schema: $ref: '#/definitions/ginresp.apiError' "500": - description: Internal Server Error + description: An internal server error occurred - try again later schema: $ref: '#/definitions/ginresp.apiError' summary: Send a new message @@ -1687,19 +1684,16 @@ paths: schema: $ref: '#/definitions/ginresp.apiError' "401": - description: Unauthorized + description: The user_id was not found or the user_key is wrong schema: $ref: '#/definitions/ginresp.apiError' "403": - description: Forbidden - schema: - $ref: '#/definitions/ginresp.apiError' - "404": - description: Not Found + description: The user has exceeded its daily quota - wait 24 hours or upgrade + your account schema: $ref: '#/definitions/ginresp.apiError' "500": - description: Internal Server Error + description: An internal server error occurred - try again later schema: $ref: '#/definitions/ginresp.apiError' summary: Send a new message @@ -1768,10 +1762,6 @@ paths: description: Forbidden schema: $ref: '#/definitions/ginresp.apiError' - "404": - description: Not Found - schema: - $ref: '#/definitions/ginresp.apiError' "500": description: Internal Server Error schema: diff --git a/server/website/api.html b/server/website/api.html index 8e3f4b8..77d42b5 100644 --- a/server/website/api.html +++ b/server/website/api.html @@ -19,22 +19,27 @@
- + API Documentation + Send

Simple Cloud Notifier

Get your user-id and user-key from the app and send notifications to your phone by performing a POST request against https://simplecloudnotifier.blackforestbytes.com/

- 
curl                                          \
-    --data "user_id={userid}"                 \
-    --data "user_key={userkey}"               \
-    --data "title={message_title}"            \
-    --data "content={message_body}"           \
-    --data "priority={0|1|2}"                 \
-    --data "msg_id={unique_message_id}"       \
+        
+curl                                           \
+    --data "user_id=${userid}"                 \
+    --data "user_key=${userkey}"               \
+    --data "title=${message_title}"            \
+    --data "content=${message_body}"           \
+    --data "priority=${0|1|2}"                 \
+    --data "msg_id=$(uuidgen)"                 \
+    --data "timestamp=$(date +%s)"             \
+    --data "channel={channel_name}"            \
     https://scn.blackforestbytes.com/

-    
The content, priority and msg_id parameters are optional, you can also send message with only a title and the default priority

-        
curl                                          \
+    
Most parameters are optional, you can send a message with only a title (default priority and channel will be used)

+        
+curl                                          \
     --data "user_id={userid}"                 \
     --data "user_key={userkey}"               \
     --data "title={message_title}"            \
diff --git a/server/website/api_more.html b/server/website/api_more.html
index f86c54a..0dfde2a 100644
--- a/server/website/api_more.html
+++ b/server/website/api_more.html
@@ -19,7 +19,8 @@
- + API Documentation + Send

Simple Cloud Notifier

 @@ -30,7 +31,7 @@ With this API you can send push notifications to your phone.

- To recieve them you will need to install the SimpleCloudNotifier app from the play store. + To receive them you will need to install the SimpleCloudNotifier app from the play store. When you open the app you can click on the account tab to see you unique user_id and user_key. These two values are used to identify and authenticate your device so that send messages can be routed to your phone.

@@ -45,7 +46,7 @@

Quota

- By default you can send up to 100 messages per day per device. + By default you can send up to 50 messages per day per device. If you need more you can upgrade your account in the app to get 1000 messages per day, this has the additional benefit of removing ads and supporting the development of the app (and making sure I can pay the server costs).

@@ -54,10 +55,10 @@

To send a new notification you send a POST request to the URL https://scn.blackforestbytes.com/. - All Parameters can either directly be submitted as URL parameters or they can be put into the POST body. + All Parameters can either directly be submitted as URL parameters or they can be put into the POST body (either multipart/form-data or JSON).

- You need to supply a valid user_id - user_key pair and a title for your message, all other parameter are optional. + You need to supply a valid [user_id, user_key] pair and a title for your message, all other parameter are optional.

@@ -81,7 +82,7 @@ "quota_max":100 }

- If the operation is not successful the API will respond with an 4xx HTTP statuscode. + If the operation is not successful the API will respond with a 4xx or 500 HTTP statuscode.

@@ -107,10 +108,6 @@ - - - - @@ -122,10 +119,10 @@ The success field is always there and in the error state you the message field to get a descritpion of the problem. 

{
-    "success":false,
-    "error":2101,
-    "errhighlight":-1,
-    "message":"Daily quota reached (100)"
+    "success": false,
+    "error": 2101,
+    "errhighlight": -1,
+    "message": "Daily quota reached (100)"
 }
@@ -133,7 +130,7 @@

Every message must have a title set. - But you also (optionally) add more content, while the title has a max length of 120 characters, the conntent can be up to 10.000 characters. + But you also (optionally) add more content, while the title has a max length of 120 characters, the content can be up to 10.000 characters. You can see the whole message with title and content in the app or when clicking on the notification.

@@ -165,6 +162,21 @@ https://scn.blackforestbytes.com/s

+

Channels

+
+

+ By default all messages are sent to the user default channel (typically main) + You can specify a different channel with the channel parameter, if the channel does not already exist it will be created. + Channel names are case-insensitive and can only contain letters, numbers, underscores and minuses ( /[[:alnum:]\-_]+/ ) +

+ 
curl                                          \
+    --data "user_id={userid}"                 \
+    --data "user_key={userkey}"               \
+    --data "title={message_title}"            \
+    --data "channel={my_channel}"             \
+    https://scn.blackforestbytes.com/s
+
+

Message Uniqueness

@@ -172,7 +184,7 @@

To ensure that a message is only send once you can generate a unique id for your message (I would recommend a simple uuidgen). - If you send a message with an UUID that was already used in the near past the API still returns OK, but no new message is sent. + If you send a message with a UUID that was already used in the near past the API still returns OK, but no new message is sent.

The message_id is optional - but if you want to use it you need to supply it via the msg_id parameter. @@ -208,90 +220,9 @@

Depending on your use case it can be useful to create a bash script that handles things like resending messages if you have connection problems or waiting if there is no quota left.
- Here is an example how such a scrippt could look like, you can put it into /usr/local/sbin and call it with scn_send "title" "content" -

- 
#!/usr/bin/env bash
-
-#
-# Call with   `scn_send title`
-#        or   `scn_send title content`
-#        or   `scn_send title content priority`
-#
-#
-
-if [ "$#" -lt 1 ]; then
-    echo "no title supplied via parameter"
-    exit 1
-fi
-
-################################################################################
-# INSERT YOUR DATA HERE                                                        #
-################################################################################
-user_id=999
-user_key="????????????????????????????????????????????????????????????????"
-################################################################################
-
-title=$1
-content=""
-sendtime=$(date +%s)
-
-if [ "$#" -gt 1 ]; then
-    content=$2
-fi
-
-priority=1
-
-if [ "$#" -gt 2 ]; then
-    priority=$3
-fi
-
-usr_msg_id=$(uuidgen)
-
-while true ; do
-
-    curlresp=$(curl -s -o /dev/null -w "%{http_code}" \
-                    -d "user_id=$user_id" -d "user_key=$user_key" -d "title=$title" -d "timestamp=$sendtime" \
-                    -d "content=$content" -d "priority=$priority" -d "msg_id=$usr_msg_id" \
-                    https://scn.blackforestbytes.com/)
-
-    if [ "$curlresp" == 200 ] ; then
-        echo "Successfully send"
-        exit 0
-    fi
-
-    if [ "$curlresp" == 400 ] ; then
-        echo "Bad request - something went wrong"
-        exit 1
-    fi
-
-    if [ "$curlresp" == 401 ] ; then
-        echo "Unauthorized - wrong userid/userkey"
-        exit 1
-    fi
-
-    if [ "$curlresp" == 403 ] ; then
-        echo "Quota exceeded - wait one hour before re-try"
-        sleep 3600
-    fi
-
-    if [ "$curlresp" == 412 ] ; then
-        echo "Precondition Failed - No device linked"
-        exit 1
-    fi
-
-    if [ "$curlresp" == 500 ] ; then
-        echo "Internal server error - waiting for better times"
-        sleep 60
-    fi
-
-    # if none of the above matched we probably hav no network ...
-    echo "Send failed (response code $curlresp) ... try again in 5s"
-    sleep 5
-done
-
-

- Be aware that the server only saves send messages for a short amount of time. Because of that you can only use this to prevent duplicates in a short time-frame, older messages with the same ID are probably already deleted and the message will be send again. + Here is an example how such a scrippt could look like, you can put it into /usr/local/sbin and call it with scn_send "title" "content" (or with more parameters, see the script itself)

+ 
{{template|scn_send.html}}
diff --git a/server/website/css/style.css b/server/website/css/style.css index 3ac9347..0e04e7e 100644 --- a/server/website/css/style.css +++ b/server/website/css/style.css @@ -22,19 +22,18 @@ body #mainpnl { box-shadow: 0 0 32px #DDD; - //animation:blink-shadow ease-in-out 4s infinite; width: 87%; min-width: 300px; max-width: 900px; position: relative; - min-height: 570px; + min-height: 525px; background: var(--form-back-color); color: var(--form-fore-color); border: .0625rem solid var(--form-border-color); border-radius: var(--universal-border-radius); margin: 32px .5rem; - padding: calc(2 * var(--universal-padding)) var(--universal-padding); + padding: calc(2 * var(--universal-padding)) var(--universal-padding) var(--universal-padding); } .red-code @@ -126,7 +125,7 @@ body text-align: center; } -#tl_link +#tl_link1 { position: absolute; top: 0; @@ -137,6 +136,37 @@ body padding: 4px 4px 0 4px; } +#tl_link2 +{ + position: absolute; + top: 0; + left: 48px; + margin: -1px 0 0 -1px; + border-top-right-radius: 0; + border-bottom-left-radius: 0; + padding: 4px 4px 0 4px; +} + +#tl_linkDocs +{ + position: absolute; + top: 0; + left: 0; + margin: -1px 0 0 -1px; + border-top-right-radius: 0; + border-bottom-left-radius: 0; + padding: 4px; + display: flex; +} + +.tl_btntxt +{ + margin-left: 0.66rem; + margin-right: 0.33rem; + margin-top: -1px; + align-self: center; +} + .icn-google-play { display: inline-block; width: 32px; @@ -145,6 +175,22 @@ body background-size: 100%; } +.icn-app-store { + display: inline-block; + width: 32px; + height: 32px; + background: url('data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IiB2aWV3Qm94PSIwIDAgMTAwMCAxMDAwIj4KCTxwYXRoIGZpbGw9IiM0NDQiIGQ9Ik05MjEuMiw3MjljLTIzLDUxLTM0LjEsNzMuOC02My43LDExOC45Yy00MS4zLDYyLjktOTkuNiwxNDEuMy0xNzEuOSwxNDJjLTY0LjIsMC42LTgwLjYtNDEuOC0xNjcuOC00MS4zYy04Ny4xLDAuNS0xMDUuMyw0Mi0xNjkuNSw0MS40Yy03Mi4yLTAuNy0xMjcuNS03MS41LTE2OC44LTEzNC40QzYzLjksNjc5LjYsNTEuOCw0NzMsMTIzLjEsMzYzLjJjNTAuNy03OCwxMzAuNy0xMjMuNywyMDUuOS0xMjMuN2M3Ni42LDAsMTI0LjcsNDIsMTg4LDQyYzYxLjQsMCw5OC44LTQyLDE4Ny4zLTQyYzY2LjksMCwxMzcuOCwzNi40LDE4OC4zLDk5LjRDNzI3LjEsNDI5LjUsNzU0LDY2NS44LDkyMS4yLDcyOXogTTYzNy4xLDE2OS4xYzMyLjItNDEuMyw1Ni42LTk5LjYsNDcuNy0xNTkuMWMtNTIuNSwzLjYtMTE0LDM3LTE0OS45LDgwLjZjLTMyLjYsMzkuNS01OS40LDk4LjItNDksMTU1LjJDNTQzLjQsMjQ3LjYsNjAyLjcsMjEzLjMsNjM3LjEsMTY5LjF6Ii8+Cjwvc3ZnPg==') 50% 50% no-repeat; + background-size: 100%; +} + +.icn-openapi { + display: inline-block; + width: 32px; + height: 32px; + background: url('data:image/svg+xml;base64,<?xml version="1.0" encoding="UTF-8" standalone="no"?>

<svg
   width="674.31311"
   height="670.66205"
   viewBox="0 0 178.41201 177.446"
   version="1.1"
   id="svg5"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:svg="http://www.w3.org/2000/svg">
  <defs
     id="defs2" />
  <g
     id="layer1">
    <path
       d="M 61.214818,91.839184 H 19.333923 c 0.0079,0.20638 0.01323,0.41011 0.02381,0.61383 0.01588,0.39423 0.04498,0.78582 0.06879,1.18005 0.01058,0.16933 0.01852,0.33866 0.03175,0.50535 0.03175,0.45508 0.07144,0.91017 0.113771,1.3626 0.01058,0.10319 0.01852,0.20638 0.0291,0.30428 0.04763,0.50535 0.103187,1.0107 0.161396,1.51077 0.0026,0.0476 0.0079,0.0979 0.01587,0.14552 0.06615,0.53975 0.134937,1.08214 0.214312,1.61925 0,0.008 0,0.0159 0.0026,0.0212 a 70.392396,70.392396 0 0 0 2.164292,9.895406 c 0.0053,0.0132 0.01058,0.0265 0.01323,0.0397 0.150812,0.51329 0.309562,1.02129 0.470958,1.52664 0.01058,0.0291 0.02117,0.0609 0.0291,0.09 0.0079,0.0291 0.01852,0.0582 0.0291,0.09 0.148167,0.45773 0.304271,0.91281 0.460375,1.37054 0.03969,0.11377 0.07938,0.23019 0.121708,0.3466 0.14023,0.39423 0.283105,0.78846 0.431271,1.18534 0.06879,0.17727 0.134938,0.35454 0.201084,0.53446 0.129645,0.32808 0.254,0.65352 0.383645,0.97895 0.0979,0.24607 0.198438,0.49213 0.301625,0.73555 0.105834,0.25664 0.211667,0.508 0.320146,0.76464 0.132292,0.31221 0.272521,0.62177 0.410104,0.93398 0.08202,0.18521 0.166688,0.36777 0.248709,0.55298 0.169333,0.37306 0.343958,0.74612 0.521229,1.11654 0.05821,0.11906 0.113771,0.23813 0.171979,0.35454 0.206375,0.42863 0.415396,0.84932 0.627063,1.27 0.03704,0.0635 0.06615,0.12965 0.100541,0.19315 0.238125,0.46567 0.481542,0.92869 0.732896,1.38906 0.01058,0.0212 0.02381,0.0397 0.03175,0.0635 0.05292,0.0952 0.111125,0.18786 0.164042,0.28311 l 35.769021,-21.54503 0.132291,-0.0794 c -1.410229,-2.973906 -2.288646,-6.138326 -2.616729,-9.353016 z"
       fill="#93d500"
       id="path9"
       style="stroke-width:0.264583" />
    <path
       d="m 71.509756,111.06645 -0.100542,0.10054 -29.501042,29.4984 c 0.150813,0.14023 0.301625,0.28575 0.457729,0.42068 0.275167,0.25136 0.555625,0.49742 0.833438,0.74348 0.145521,0.127 0.28575,0.254 0.431271,0.381 0.333375,0.2884 0.672041,0.56886 1.008062,0.85196 0.0926,0.0767 0.179917,0.15081 0.272521,0.22754 a 67.62115,67.62115 0 0 0 1.299104,1.04246 c 0.418042,0.33073 0.838729,0.65088 1.267354,0.97367 0.01852,0.0106 0.03175,0.0212 0.04763,0.0344 a 70.506167,70.506167 0 0 0 5.519209,3.73063 c 0.0635,0.0423 0.129646,0.0794 0.195791,0.12171 0.36248,0.21431 0.722313,0.42862 1.087438,0.64029 l 0.66675,0.381 c 0.211667,0.12171 0.420687,0.23812 0.632354,0.35454 0.383646,0.20902 0.767292,0.41804 1.153584,0.62177 0.05292,0.0291 0.105833,0.0582 0.161395,0.0847 1.071563,0.56092 2.161646,1.08215 3.262313,1.58485 l 1.04775,-2.54264 14.837833,-36.02831 0.05292,-0.1323 c -1.61925,-0.86783 -3.172354,-1.89441 -4.632854,-3.09033 z"
       fill="#4d5a31"
       id="path11"
       style="stroke-width:0.264583" />
    <path
       d="m 68.437943,108.12693 a 25.265592,25.265592 0 0 1 -0.92075,-1.08479 c -0.264583,-0.32544 -0.518583,-0.65352 -0.764646,-0.9869 -0.283104,-0.381 -0.558271,-0.76729 -0.820208,-1.15887 -0.261938,-0.39423 -0.521229,-0.79111 -0.764646,-1.19327 l -35.814,21.57147 c 0.550334,0.91546 1.121834,1.80446 1.709209,2.68288 0.01852,0.0318 0.03704,0.0635 0.05821,0.0926 0.0053,0.0132 0.01323,0.0212 0.02117,0.0344 0.01852,0.0265 0.03704,0.0582 0.05556,0.0873 0.0026,0.003 0.0053,0.005 0.0053,0.0106 0.04763,0.0688 0.09525,0.13758 0.142875,0.20902 0.0026,0.003 0.0053,0.008 0.01058,0.0132 0.0053,0.005 0.0026,0.003 0.0026,0.005 0.621771,0.9181 1.262062,1.82298 1.920875,2.70668 0.01323,0.0185 0.0291,0.037 0.04233,0.0556 0.01587,0.0185 0.0291,0.037 0.04233,0.0556 0.288395,0.37835 0.574145,0.75671 0.870479,1.13242 0.03969,0.0503 0.07673,0.0979 0.119062,0.14552 0.301625,0.38893 0.611188,0.77258 0.926042,1.15093 0.07408,0.09 0.150812,0.17992 0.224896,0.27253 0.283104,0.33866 0.566208,0.67468 0.854604,1.00806 0.124354,0.14287 0.251354,0.28839 0.378354,0.42862 0.246063,0.28046 0.489479,0.56092 0.740833,0.83609 0.137584,0.15081 0.280459,0.30427 0.420688,0.45508 0.0635,0.0714 0.127,0.13758 0.193146,0.20902 0.182562,0.19844 0.365125,0.39688 0.550333,0.59267 0.07408,0.0767 0.153458,0.15346 0.227542,0.23283 0.325437,0.33867 0.656166,0.67998 0.989541,1.01335 l 29.546021,-29.54072 c -0.338667,-0.33867 -0.656166,-0.68792 -0.968375,-1.03717 z"
       fill="#6ba43a"
       id="path13"
       style="stroke-width:0.264583" />
    <path
       d="m 107.59892,111.05057 c -0.32543,0.26194 -0.65352,0.51859 -0.98689,0.76465 l 0.0714,0.12435 21.54237,35.75315 c 0.99748,-0.65087 1.98437,-1.32292 2.94746,-2.02935 2.08491,-1.53723 4.10104,-3.20411 6.04573,-4.99798 l -29.50369,-29.4984 z"
       fill="#4d5a31"
       id="path15"
       style="stroke-width:0.264583" />
    <path
       d="m 125.09582,147.98641 -0.73025,-1.21444 -20.10833,-33.3719 c -0.40746,0.24342 -0.82286,0.46567 -1.23825,0.68792 -0.42069,0.22754 -0.84138,0.43656 -1.27,0.64029 -3.862921,1.83092 -8.043339,2.76754 -12.231693,2.76754 -2.743729,0 -5.484812,-0.39687 -8.135937,-1.18797 -0.452438,-0.13494 -0.894292,-0.31221 -1.338792,-0.47096 -0.447146,-0.15611 -0.899583,-0.29369 -1.338792,-0.47361 l -14.82725,36.0045 -0.579437,1.41023 -0.497417,1.20915 -0.0026,0.005 c 0.03704,0.0159 0.07673,0.0291 0.113771,0.045 0.04233,0.0159 0.08202,0.0291 0.121709,0.0476 h 0.0053 c 0.01058,0.005 0.02117,0.008 0.0291,0.0106 0.34925,0.14552 0.701146,0.26723 1.053042,0.40481 0.441854,0.17198 0.881063,0.3466 1.322917,0.508 0.227541,0.082 0.449791,0.17727 0.674687,0.25665 h 0.0026 a 70.754875,70.754875 0 0 0 14.337771,3.43164 c 0.193146,0.0238 0.381,0.0503 0.574146,0.0767 0.198437,0.0238 0.399521,0.0423 0.600604,0.0661 0.375708,0.0423 0.751417,0.0847 1.129771,0.1217 l 0.280458,0.0238 c 0.463021,0.045 0.926042,0.0847 1.386417,0.11641 0.15875,0.0132 0.3175,0.0185 0.473604,0.0317 0.404812,0.0265 0.809625,0.0503 1.214437,0.0688 0.248709,0.0159 0.497417,0.0212 0.746125,0.0317 0.322792,0.0106 0.642938,0.0238 0.96573,0.0344 0.46302,0.0106 0.931333,0.0132 1.397,0.0159 0.111125,0 0.219604,0.003 0.330729,0.005 3.902604,0 7.805209,-0.32544 11.66548,-0.97367 0.0635,-0.0106 0.12965,-0.0212 0.19579,-0.0291 0.40746,-0.0714 0.81492,-0.14817 1.22238,-0.22225 0.23283,-0.045 0.46831,-0.09 0.69585,-0.13494 0.23813,-0.0503 0.4789,-0.0979 0.71702,-0.15081 0.39688,-0.082 0.79375,-0.16934 1.19327,-0.26194 0.0714,-0.0159 0.14288,-0.0291 0.21431,-0.0503 5.86846,-1.36525 11.53584,-3.48192 16.85926,-6.28386 v -0.003 c 0.34925,-0.18256 0.69056,-0.39158 1.03717,-0.58208 0.41275,-0.2249 0.82285,-0.46038 1.2356,-0.69586 0.2831,-0.16139 0.5715,-0.31221 0.8546,-0.48154 0.003,-0.003 0.005,-0.005 0.008,-0.005 h 0.003 c 0.005,-0.003 0.008,-0.005 0.0132,-0.008 l 0.005,-0.005 -0.0529,-0.0873 0.0529,0.0873 c 0.003,0 0.005,-0.003 0.008,-0.003 0.005,-0.003 0.008,-0.005 0.0132,-0.008 0.0159,-0.0106 0.0318,-0.0185 0.0476,-0.0291 0.09,-0.0556 0.18256,-0.10848 0.27517,-0.16404 z M 71.525631,66.965704 c 0.325437,-0.26458 0.656166,-0.51858 0.986895,-0.76729 l -0.07144,-0.12171 -21.542375,-35.755793 c -1.000125,0.653521 -1.987021,1.328209 -2.95275,2.034646 -2.082271,1.534583 -4.101042,3.198813 -6.040438,4.990043 l 29.503688,29.501044 z"
       fill="#93d500"
       id="path17"
       style="stroke-width:0.264583" />
    <path
       d="m 39.860297,39.31145 c -0.336021,0.33602 -0.653521,0.68263 -0.981604,1.02129 -0.325437,0.34132 -0.658812,0.67998 -0.978958,1.02394 a 70.420442,70.420442 0 0 0 -5.969,7.39775 c -0.08731,0.11906 -0.171979,0.24606 -0.259292,0.36777 -0.201083,0.29634 -0.402167,0.59002 -0.597958,0.88636 -0.206375,0.30691 -0.410104,0.61912 -0.608542,0.92868 -0.07408,0.11377 -0.148166,0.23019 -0.219604,0.34396 -6.786562,10.644194 -10.421937,22.717134 -10.911416,34.890614 -0.01852,0.4736 -0.02911,0.9472 -0.03969,1.41816 -0.0079,0.47096 -0.02381,0.94457 -0.02381,1.41552 h 41.785645 c 0,-0.47095 0.04233,-0.94191 0.06879,-1.41552 0.02381,-0.4736 0.0291,-0.94721 0.07673,-1.41816 0.53975,-5.43984 2.640542,-10.75267 6.302375,-15.21355 0.296333,-0.36247 0.632354,-0.70379 0.9525,-1.05304 0.314854,-0.35189 0.611187,-0.71437 0.949854,-1.05304 z M 126.07478,28.939786 c -0.0556,-0.0344 -0.11642,-0.06879 -0.17198,-0.103187 -0.36777,-0.224896 -0.73819,-0.441854 -1.11125,-0.658813 -0.21431,-0.124354 -0.43127,-0.246062 -0.64559,-0.367771 -0.2196,-0.121708 -0.43391,-0.243416 -0.65352,-0.362479 a 238.49542,238.49542 0 0 0 -1.13506,-0.613833 c -0.0609,-0.0291 -0.11906,-0.06085 -0.17992,-0.0926 -2.45004,-1.280584 -4.96622,-2.407709 -7.53533,-3.386667 -0.0662,-0.02646 -0.13229,-0.05292 -0.19844,-0.07673 -0.56091,-0.209021 -1.12183,-0.418042 -1.68804,-0.613833 A 70.665975,70.665975 0 0 0 98.677169,19.322182 l -0.58737,-0.07938 c -0.19844,-0.02381 -0.39423,-0.04233 -0.59002,-0.0635 -0.37836,-0.04498 -0.75407,-0.08731 -1.13507,-0.124354 -0.10318,-0.01058 -0.20902,-0.01588 -0.317495,-0.0291 -0.447146,-0.03969 -0.899583,-0.07937 -1.349375,-0.113771 l -0.526521,-0.03175 c -0.383646,-0.02381 -0.775229,-0.05292 -1.158875,-0.06879 -0.206375,-0.01058 -0.41275,-0.01852 -0.616479,-0.02381 v 41.880897 c 2.148417,0.22225 4.278315,0.67998 6.344705,1.38113 L 129.56728,31.228432 c -1.14565,-0.79375 -2.30188,-1.566333 -3.4925,-2.288646 z"
       fill="#4d5a31"
       id="path19"
       style="stroke-width:0.264583" />
    <path
       d="m 88.146756,18.753328 c -0.473605,0.01058 -0.947209,0.01058 -1.418167,0.0291 -2.955396,0.119063 -5.9055,0.420688 -8.831792,0.912813 -0.0635,0.01058 -0.127,0.02117 -0.193146,0.03175 -0.410104,0.07144 -0.817562,0.14552 -1.22502,0.22225 -0.230188,0.04498 -0.463021,0.08731 -0.695855,0.132291 -0.24077,0.04763 -0.478895,0.0979 -0.719666,0.150813 -0.396875,0.08202 -0.79375,0.169333 -1.187979,0.261937 -0.07408,0.01323 -0.145521,0.03175 -0.216959,0.04763 a 70.766781,70.766781 0 0 0 -16.861896,6.2865 c -0.346604,0.185209 -0.68527,0.394229 -1.031875,0.582084 -0.41275,0.227541 -0.8255,0.460375 -1.235604,0.695854 -0.30427,0.177271 -0.613833,0.338666 -0.918104,0.518583 -0.0026,0.0026 -0.0079,0.0053 -0.01058,0.0053 -0.02117,0.01323 -0.04233,0.02646 -0.0635,0.03704 -0.07937,0.05027 -0.161396,0.08996 -0.240771,0.137584 l 0.0026,0.0053 0.732896,1.214438 20.835937,34.588979 c 0.407459,-0.24341 0.822854,-0.46831 1.23825,-0.69056 0.418042,-0.22489 0.841375,-0.43656 1.267354,-0.63764 a 28.376562,28.376562 0 0 1 9.355667,-2.62203 c 0.470958,-0.0476 0.941917,-0.0873 1.415521,-0.11112 0.470958,-0.0238 0.944562,-0.0476 1.418167,-0.0476 v -41.7804 c -0.473605,0 -0.944563,0.02117 -1.415521,0.0291 z"
       fill="#6ba43a"
       id="path21"
       style="stroke-width:0.264583" />
    <path
       d="m 159.76682,85.552684 c -0.0212,-0.37571 -0.0423,-0.74877 -0.0688,-1.12712 a 19.949583,19.949583 0 0 0 -0.037,-0.56092 c -0.0291,-0.44185 -0.0661,-0.88371 -0.10848,-1.32556 -0.008,-0.11377 -0.0185,-0.22754 -0.0291,-0.34132 -0.0476,-0.49477 -0.10054,-0.98689 -0.15875,-1.47902 -0.005,-0.0397 -0.008,-0.0794 -0.0132,-0.11906 l -0.008,-0.0556 c -0.0635,-0.53181 -0.13494,-1.06362 -0.20903,-1.59279 l -0.008,-0.0503 a 70.499287,70.499287 0 0 0 -2.159,-9.8769 c -0.008,-0.0238 -0.0132,-0.0423 -0.0212,-0.0635 -0.15081,-0.50535 -0.30692,-1.00541 -0.46302,-1.50548 -0.0238,-0.0662 -0.045,-0.13229 -0.0661,-0.19843 -0.14816,-0.45244 -0.29898,-0.90223 -0.45508,-1.35202 l -0.127,-0.36513 c -0.13758,-0.38894 -0.28046,-0.77787 -0.42333,-1.16681 -0.0714,-0.18521 -0.14023,-0.37042 -0.21432,-0.55298 -0.1217,-0.32279 -0.24606,-0.64294 -0.3757,-0.96044 -0.10055,-0.25664 -0.20373,-0.508 -0.30692,-0.75671 -0.10319,-0.25135 -0.20902,-0.49741 -0.31221,-0.74612 -0.13758,-0.3175 -0.27781,-0.635 -0.41804,-0.94986 -0.0794,-0.17727 -0.15875,-0.35718 -0.24077,-0.5371 -0.17198,-0.37571 -0.34925,-0.75406 -0.52652,-1.12977 -0.0556,-0.11113 -0.11113,-0.22754 -0.16669,-0.34131 -0.20637,-0.42863 -0.41804,-0.8599 -0.635,-1.28323 -0.0291,-0.0582 -0.0608,-0.11906 -0.09,-0.17727 -0.24077,-0.46832 -0.48948,-0.93927 -0.73819,-1.40229 -0.0106,-0.0159 -0.0185,-0.0344 -0.0291,-0.0503 a 70.641104,70.641104 0 0 0 -3.99785,-6.487594 l -30.83446,30.834544 c 0.70115,2.0664 1.15623,4.19629 1.37848,6.34206 h 41.88884 c -0.0106,-0.20902 -0.0159,-0.41804 -0.0265,-0.62177 z"
       fill="#4d5a31"
       id="path23"
       style="stroke-width:0.264583" />
    <path
       d="m 118.06849,89.005494 c 0,0.47361 -0.045,0.94457 -0.0688,1.41817 -0.0238,0.47361 -0.0318,0.94721 -0.0794,1.41552 -0.53975,5.44248 -2.6379,10.755306 -6.29973,15.218826 -0.29634,0.36248 -0.63236,0.70115 -0.9525,1.05304 -0.3175,0.34925 -0.61119,0.71173 -0.94986,1.0504 l 29.54603,29.54073 c 0.33602,-0.33602 0.65087,-0.68263 0.97895,-1.02394 0.32809,-0.34131 0.66146,-0.67733 0.97896,-1.02394 2.18546,-2.36802 4.18571,-4.84452 5.98488,-7.41891 0.0741,-0.10319 0.14023,-0.20373 0.21166,-0.30427 0.21961,-0.31486 0.43128,-0.635 0.64823,-0.9525 0.18786,-0.28575 0.37571,-0.56886 0.55827,-0.85725 0.0926,-0.13759 0.18257,-0.28046 0.26988,-0.41805 6.77598,-10.63889 10.40342,-22.6986 10.89025,-34.864136 0.0185,-0.47096 0.0291,-0.94456 0.037,-1.41817 0.0106,-0.47095 0.0238,-0.94191 0.0238,-1.41552 z"
       fill="#6ba43a"
       id="path25"
       style="stroke-width:0.264583" />
    <path
       d="m 172.26044,6.3152649 c -7.64381,-7.643812 -20.03689,-7.643812 -27.6807,0 -6.09865,6.0960001 -7.31838,15.2108961 -3.68565,22.5292711 L 98.253839,71.482144 c -7.318375,-3.63008 -16.435917,-2.413 -22.534563,3.683 -7.643812,7.64381 -7.641166,20.0369 0,27.680706 7.646459,7.64381 20.042188,7.64116 27.686004,0 6.09864,-6.098646 7.31573,-15.213536 3.683,-22.531916 L 149.72853,37.67897 c 7.32102,3.63009 16.43327,2.413 22.53191,-3.68564 7.64382,-7.641169 7.64382,-20.034252 0,-27.6780651 z"
       fill="#424143"
       id="path27"
       style="stroke-width:0.264583" />
  </g>
</svg>
'); + background-size: 100%; +} + #btnSend { height: 42px; diff --git a/server/website/index.html b/server/website/index.html index 0c553a0..0a29f1a 100644 --- a/server/website/index.html +++ b/server/website/index.html @@ -21,7 +21,9 @@ - + + + API

Simple Cloud Notifier

 @@ -36,6 +38,11 @@
+
+
+
+
+
@@ -48,13 +55,13 @@
-
-
+
+
-
-
+
+
diff --git a/server/website/js/logic.js b/server/website/js/logic.js index 756a965..53b03b3 100644 --- a/server/website/js/logic.js +++ b/server/website/js/logic.js @@ -10,22 +10,24 @@ function send() let uid = document.getElementById("uid"); let key = document.getElementById("ukey"); - let msg = document.getElementById("msg"); - let txt = document.getElementById("txt"); + let tit = document.getElementById("tit"); + let cnt = document.getElementById("cnt"); let pio = document.getElementById("prio"); + let cha = document.getElementById("chan"); uid.classList.remove('input-invalid'); key.classList.remove('input-invalid'); msg.classList.remove('input-invalid'); - txt.classList.remove('input-invalid'); + cnt.classList.remove('input-invalid'); pio.classList.remove('input-invalid'); let data = new FormData(); data.append('user_id', uid.value); data.append('user_key', key.value); - data.append('title', msg.value); - data.append('content', txt.value); - data.append('priority', pio.value); + if (tit.value !== '') data.append('title', tit.value); + if (cnt.value !== '') data.append('content', cnt.value); + if (pio.value !== '') data.append('priority', pio.value); + if (cha.value !== '') data.append('channel', cha.value); let xhr = new XMLHttpRequest(); xhr.open('POST', '/send.php', true); @@ -41,9 +43,10 @@ function send() { if (resp.errhighlight === 101) uid.classList.add('input-invalid'); if (resp.errhighlight === 102) key.classList.add('input-invalid'); - if (resp.errhighlight === 103) msg.classList.add('input-invalid'); - if (resp.errhighlight === 104) txt.classList.add('input-invalid'); + if (resp.errhighlight === 103) tit.classList.add('input-invalid'); + if (resp.errhighlight === 104) cnt.classList.add('input-invalid'); if (resp.errhighlight === 105) pio.classList.add('input-invalid'); + if (resp.errhighlight === 106) cha.classList.add('input-invalid'); Toastify({ text: resp.message, @@ -62,7 +65,8 @@ function send() '"a_remain=' + (resp.quota_max-resp.quota) + '"a_max=' + resp.quota_max + '&preset_user_id=' + uid.value + - '&preset_user_key=' + key.value; + '&preset_user_key=' + key.value + + '&preset_channel=' + cha.value; } } else @@ -85,23 +89,21 @@ window.addEventListener("load", function () { const qp = new URLSearchParams(window.location.search); - const btnSend = document.getElementById("btnSend"); - const selPrio = document.getElementById("prio"); - const txtKey = document.getElementById("ukey"); - const txtUID = document.getElementById("uid"); - const txtTitl = document.getElementById("msg"); - const txtCont = document.getElementById("txt"); + let btn = document.getElementById("btnSend"); + let uid = document.getElementById("uid"); + let key = document.getElementById("ukey"); + let tit = document.getElementById("tit"); + let cnt = document.getElementById("cnt"); + let pio = document.getElementById("prio"); + let cha = document.getElementById("chan"); - btnSend.onclick = function () { send(); return false; }; + btn.onclick = function () { send(); return false; }; - if (qp.has('preset_priority')) selPrio.selectedIndex = parseInt(qp.get("preset_priority")); - - if (qp.has('preset_user_key')) txtKey.value = qp.get("preset_user_key"); - - if (qp.has('preset_user_id')) txtUID.value = qp.get("preset_user_id"); - - if (qp.has('preset_title')) txtTitl.value = qp.get("preset_title"); - - if (qp.has('preset_content')) txtCont.value = qp.get("preset_content"); + if (qp.has('preset_priority')) pio.selectedIndex = parseInt(qp.get("preset_priority")); + if (qp.has('preset_user_key')) key.value = qp.get("preset_user_key"); + if (qp.has('preset_user_id')) uid.value = qp.get("preset_user_id"); + if (qp.has('preset_title')) tit.value = qp.get("preset_title"); + if (qp.has('preset_content')) cnt.value = qp.get("preset_content"); + if (qp.has('preset_channel')) cha.value = qp.get("preset_channel"); }, false); \ No newline at end of file diff --git a/server/website/js/message_sent.js b/server/website/js/message_sent.js index 28dfdc9..a15b524 100644 --- a/server/website/js/message_sent.js +++ b/server/website/js/message_sent.js @@ -14,7 +14,10 @@ window.addEventListener("load", function () const preset_user_id = qp.get('preset_user_id') ?? 'ERR'; const preset_user_key = qp.get('preset_user_key') ?? 'ERR'; - linkSucc.setAttribute("href", "/?preset_user_id="+preset_user_id+"&preset_user_key="+preset_user_key); + let hrefBack = "/?preset_user_id="+preset_user_id+"&preset_user_key="+preset_user_key + if (qp.has('preset_channel') && qp.get('preset_channel') !== '') hrefBack += "&preset_channel="+qp.get('preset_channel') + + linkSucc.setAttribute("href", hrefBack); if (qp.get("ok") === "1") { diff --git a/server/website/message_sent.html b/server/website/message_sent.html index ca84126..ade52e6 100644 --- a/server/website/message_sent.html +++ b/server/website/message_sent.html @@ -20,9 +20,16 @@
+ + + + Send + +

Simple Cloud Notifier

 +
- +

Message sent

Message succesfully sent
@@ -39,10 +46,6 @@

- - Send - -

Simple Cloud Notifier
diff --git a/server/website/scn_send.html b/server/website/scn_send.html new file mode 100644 index 0000000..008c37b --- /dev/null +++ b/server/website/scn_send.html @@ -0,0 +1,131 @@ + + + +#!/usr/bin/env bash + +# +# Wrapper around SCN ( https://scn.blackforestbytes.com/ ) +# ======================================================== +# +# ./scn_send [@channel] title [content] [priority] +# +# +# Call with scn_send "${title}" +# or scn_send "${title}" ${content}" +# or scn_send "${title}" ${content}" "${priority:0|1|2}" +# or scn_send "@${channel} "${title}" +# or scn_send "@${channel} "${title}" ${content}" +# or scn_send "@${channel} "${title}" ${content}" "${priority:0|1|2}" +# +# + +################################################################################ +# INSERT YOUR DATA HERE # +################################################################################ +user_id="999" +user_key="??" +################################################################################ + +usage() { + echo "Usage: " + echo " scn_send [@channel] title [content] [priority]" + echo "" +} + +args=( "$@" ) + +title=$1 +content="" +channel="" +priority=1 +usr_msg_id=$(uuidgen) +sendtime=$(date +%s) + +if [ ${#args[@]} -lt 1 ]; then + echo "[ERROR]: no title supplied via parameter" 1>&2 + usage + exit 1 +fi + +if [[ "${args[0]}" =~ ^@.* ]]; then + channel="${args[0]}" + unset "args[0]" + channel="${channel:1}" +fi + +if [ ${#args[@]} -lt 1 ]; then + echo "[ERROR]: no title supplied via parameter" 1>&2 + usage + exit 1 +fi + +title="${args[0]}" +content="" +sendtime=$(date +%s) + +if [ ${#args[@]} -gt 1 ]; then + content="${args[0]}" + unset "args[0]" +fi + +if [ ${#args[@]} -gt 1 ]; then + priority="${args[0]}" + unset "args[0]" +fi + +if [ ${#args[@]} -gt 1 ]; then + echo "Too many arguments to scn_send" 1>&2 + usage + exit 1 +fi + + +while true ; do + + curlresp=$(curl --silent \ + --output /dev/null \ + --write-out "%{http_code}" \ + --data "user_id=$user_id" \ + --data "user_key=$user_key" \ + --data "title=$title" \ + --data "timestamp=$sendtime" \ + --data "content=$content" \ + --data "priority=$priority" \ + --data "msg_id=$usr_msg_id" \ + --data "channel=$channel" \ + "https://scn.blackforestbytes.com/" ) + + if [ "$curlresp" == 200 ] ; then + echo "Successfully send" + exit 0 + fi + + if [ "$curlresp" == 400 ] ; then + echo "Bad request - something went wrong" 1>&2 + exit 1 + fi + + if [ "$curlresp" == 401 ] ; then + echo "Unauthorized - wrong userid/userkey" 1>&2 + exit 1 + fi + + if [ "$curlresp" == 403 ] ; then + echo "Quota exceeded - wait one hour before re-try" 1>&2 + sleep 3600 + fi + + if [ "$curlresp" == 412 ] ; then + echo "Precondition Failed - No device linked" 1>&2 + exit 1 + fi + + if [ "$curlresp" == 500 ] ; then + echo "Internal server error - waiting for better times" 1>&2 + sleep 60 + fi + + # if none of the above matched we probably hav no network ... + echo "Send failed (response code $curlresp) ... try again in 5s" 1>&2 + sleep 5 +done
403 (Forbidden) The user has exceeded its daily quota - wait 24 hours or upgrade your account
412 (Precondition Failed)There is no device connected with this account - open the app and press the refresh button in the account tab
500 (Internal Server Error) There was an internal error while sending your data - try again later