v0.0.354

README.md

@@ -40,4 +40,6 @@ Potentially needs `export GOPRIVATE="gogs.mikescher.com"`
 |             |            |                                                                                                               |
 | rext        | Mike       | Regex Wrapper, wraps regexp with a better interface                                                           |
 | wmo         | Mike       | Mongo Wrapper, wraps mongodb with a better interface                                                          |
+|             |            |                                                                                                               |
+| scn         | Mike       | SimpleCloudNotifier                                                                                           |
 |             |            |                                                                                                               |

exerr/data.go

@@ -65,7 +65,7 @@ var (
 	TypeUnauthorized = NewType("UNAUTHORIZED", langext.Ptr(401))
 	TypeAuthFailed   = NewType("AUTH_FAILED", langext.Ptr(401))
 
-	// other values come the used package
+	// other values come from the downstream application that uses goext
 )
 
 var registeredTypes = dataext.SyncSet[string]{}

ginext/response.go

@@ -359,6 +359,10 @@ func (j jsonAPIErrResponse) Headers() []string {
 	return langext.ArrMap(j.headers, func(v headerval) string { return v.Key + "=" + v.Val })
 }
 
+func (j jsonAPIErrResponse) Unwrap() error {
+	return j.err
+}
+
 func Status(sc int) HTTPResponse {
 	return &emptyHTTPResponse{statusCode: sc}
 }

go.mod

@@ -10,8 +10,8 @@ require (
 	github.com/rs/zerolog v1.31.0
 	go.mongodb.org/mongo-driver v1.13.1
 	golang.org/x/crypto v0.17.0
-	golang.org/x/sys v0.15.0
+	golang.org/x/sys v0.16.0
-	golang.org/x/term v0.15.0
+	golang.org/x/term v0.16.0
 )
 
 require (
@@ -41,9 +41,9 @@ require (
 	github.com/xdg-go/scram v1.1.2 // indirect
 	github.com/xdg-go/stringprep v1.0.4 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
-	golang.org/x/arch v0.6.0 // indirect
+	golang.org/x/arch v0.7.0 // indirect
 	golang.org/x/net v0.19.0 // indirect
-	golang.org/x/sync v0.5.0 // indirect
+	golang.org/x/sync v0.6.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	google.golang.org/protobuf v1.32.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect

go.sum

@@ -111,6 +111,8 @@ go.mongodb.org/mongo-driver v1.13.1/go.mod h1:wcDf1JBCXy2mOW0bWHwO/IOYqdca1MPCwD
 golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
 golang.org/x/arch v0.6.0 h1:S0JTfE48HbRj80+4tbvZDYsJ3tGv6BUU3XxyZ7CirAc=
 golang.org/x/arch v0.6.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
+golang.org/x/arch v0.7.0 h1:pskyeJh/3AmoQ8CPE95vxHLqp1G1GfGNXTmcl9NEKTc=
+golang.org/x/arch v0.7.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
@@ -129,6 +131,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
 golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
+golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -142,10 +146,14 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
 golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
+golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
 golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
+golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE=
+golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=

goextVersion.go

@@ -1,5 +1,5 @@
 package goext
 
-const GoextVersion = "0.0.352"
+const GoextVersion = "0.0.354"
 
-const GoextVersionTimestamp = "2023-12-29T19:29:36+0100"
+const GoextVersionTimestamp = "2024-01-05T07:21:43+0100"

scn/scn.go

@@ -0,0 +1,13 @@
+package scn
+
+type Connection struct {
+	uid   string
+	token string
+}
+
+func New(userid string, token string) *Connection {
+	return &Connection{
+		uid:   userid,
+		token: token,
+	}
+}

scn/send.go

@@ -0,0 +1,171 @@
+package scn
+
+import (
+	"bytes"
+	"context"
+	"gogs.mikescher.com/BlackForestBytes/goext/exerr"
+	json "gogs.mikescher.com/BlackForestBytes/goext/gojson"
+	"gogs.mikescher.com/BlackForestBytes/goext/langext"
+	"io"
+	"net/http"
+	"time"
+)
+
+var (
+	ErrAuthFailed        = exerr.NewType("GOEXT_SCN_AUTHFAILED", nil)
+	ErrQuota             = exerr.NewType("GOEXT_SCN_QUOTAEXCEEDED", nil)
+	ErrBadRequest        = exerr.NewType("GOEXT_SCN_BADREQUEST", nil)
+	ErrInternalServerErr = exerr.NewType("GOEXT_SCN_INTERNALSERVER", nil)
+	ErrOther             = exerr.NewType("GOEXT_SCN_OTHER", nil)
+)
+
+type MessageResponse struct {
+	ErrHighlight int    `json:"errhighlight"`
+	Error        int    `json:"error"`
+	IsPro        bool   `json:"is_pro"`
+	Message      string `json:"message"`
+	Messagecount int    `json:"messagecount"`
+	Quota        int    `json:"quota"`
+	QuotaMax     int    `json:"quota_max"`
+	SCNMessageID string `json:"scn_msg_id"`
+	Success      bool   `json:"success"`
+	SuppressSend bool   `json:"suppress_send"`
+}
+
+type MessageErrResponse struct {
+	Errhighlight int    `json:"errhighlight"`
+	Error        int    `json:"error"`
+	Message      string `json:"message"`
+	Success      bool   `json:"success"`
+}
+
+type MessageBuilder struct {
+	conn       *Connection
+	title      string
+	content    *string
+	channel    *string
+	time       *time.Time
+	sendername *string
+	priority   *int
+}
+
+func (c *Connection) Message(title string) *MessageBuilder {
+	return &MessageBuilder{conn: c, title: title}
+}
+
+func (c *MessageBuilder) Channel(channel string) *MessageBuilder {
+	c.channel = &channel
+	return c
+}
+
+func (c *MessageBuilder) Content(content string) *MessageBuilder {
+	c.content = &content
+	return c
+}
+
+func (c *MessageBuilder) Time(t time.Time) *MessageBuilder {
+	c.time = &t
+	return c
+}
+
+func (c *MessageBuilder) SenderName(sn string) *MessageBuilder {
+	c.sendername = &sn
+	return c
+}
+
+func (c *MessageBuilder) Priority(p int) *MessageBuilder {
+	c.priority = &p
+	return c
+}
+
+func (c *MessageBuilder) Send(ctx context.Context) (MessageResponse, error) {
+	client := http.Client{Timeout: 5 * time.Second}
+
+	body := langext.H{}
+
+	body["user_id"] = c.conn.uid
+	body["key"] = c.conn.token
+
+	if c.channel != nil {
+		body["channel"] = *c.channel
+	}
+
+	body["title"] = c.title
+
+	if c.content != nil {
+		body["content"] = *c.content
+	}
+
+	if c.sendername != nil {
+		body["content"] = *c.sendername
+	}
+
+	if c.time != nil {
+		body["timestamp"] = c.time.Unix()
+	}
+
+	if c.priority != nil {
+		body["priority"] = *c.priority
+	}
+
+	body["msg_id"] = langext.MustHexUUID()
+
+	rawbody, err := json.Marshal(body)
+	if err != nil {
+		return MessageResponse{}, err
+	}
+
+	req, err := http.NewRequestWithContext(ctx, "POST", "https://simplecloudnotifier.de/", bytes.NewBuffer(rawbody))
+	if err != nil {
+		return MessageResponse{}, err
+	}
+	req.Header.Set("Content-Type", "application/json")
+
+	resp, err := client.Do(req)
+	if err != nil {
+		return MessageResponse{}, err
+	}
+
+	defer func() { _ = resp.Body.Close() }()
+
+	if resp.StatusCode >= 200 && resp.StatusCode < 300 {
+
+		raw, err := io.ReadAll(resp.Body)
+		if err != nil {
+			return MessageResponse{}, err
+		}
+
+		var mr MessageResponse
+		err = json.Unmarshal(raw, &mr)
+		if err != nil {
+			return MessageResponse{}, err
+		}
+
+		return mr, nil
+	} else {
+		errMessage := resp.Status
+
+		if raw, err := io.ReadAll(resp.Body); err == nil {
+			var mr MessageErrResponse
+			if err = json.Unmarshal(raw, &mr); err == nil {
+				errMessage = mr.Message
+			}
+		}
+
+		if resp.StatusCode == 400 {
+			return MessageResponse{}, exerr.New(ErrBadRequest, errMessage).Build()
+		}
+		if resp.StatusCode == 401 {
+			return MessageResponse{}, exerr.New(ErrAuthFailed, errMessage).Build()
+		}
+		if resp.StatusCode == 403 {
+			return MessageResponse{}, exerr.New(ErrQuota, errMessage).Build()
+		}
+		if resp.StatusCode == 500 {
+			return MessageResponse{}, exerr.New(ErrInternalServerErr, errMessage).Build()
+		}
+
+		return MessageResponse{}, exerr.New(ErrOther, errMessage).Build()
+	}
+
+}

scn/send_test.go

@@ -0,0 +1,24 @@
+package scn
+
+import (
+	"context"
+	"fmt"
+	"testing"
+)
+
+func TestSendSCN(t *testing.T) {
+	t.Skip()
+	return
+
+	mr, err := New("TODO", "TODO").
+		Message("Hello Test").
+		Content("This is a test / goext").
+		Send(context.Background())
+
+	if err != nil {
+		panic(err)
+	}
+
+	fmt.Printf("%+v\n", mr)
+
+}