From bdf29305d7580391d07f949cdf2a35b71022c2f9 Mon Sep 17 00:00:00 2001
From: Hanno Hecker <vetinari@ankh-morp.org>
Date: Sun, 19 Mar 2023 14:48:43 +0100
Subject: [PATCH] add client id settings

This adds a new config setting `clientid` in the server settings:
When unset by the user, it generates a unique one in the form of
"gotify-012345678abcdef".

The PR also fixes that the plugin does not connect on startup of
gotify (or after enabling it). Prior to this a config change was
required to connect to the broker...
---
 plugin.go | 40 ++++++++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/plugin.go b/plugin.go
index 837f724..cc9c4fe 100644
--- a/plugin.go
+++ b/plugin.go
@@ -3,6 +3,9 @@ package main
 import (
 	"encoding/json"
 	"errors"
+	"math/rand"
+	"time"
+
 	mqtt "github.com/eclipse/paho.mqtt.golang"
 	"github.com/gotify/plugin-api"
 )
@@ -25,11 +28,12 @@ type Server struct {
 	Address   string
 	Username  string
 	Password  string
+	ClientID  string
 	Subscribe []string
 }
 
 type Config struct {
-	Servers []Server
+	Servers []*Server
 }
 
 // Plugin is plugin instance
@@ -50,6 +54,7 @@ func (p *Plugin) SetMessageHandler(h plugin.MessageHandler) {
 // Enable adds users to the context map which maps to a Plugin.
 func (p *Plugin) Enable() error {
 	p.enabled = true
+	p.connectClients()
 	return nil
 }
 
@@ -65,8 +70,8 @@ func (p *Plugin) Disable() error {
 // Invoked whenever an unmarshaling is required.
 func (p *Plugin) DefaultConfig() interface{} {
 	return &Config{
-		Servers: []Server{
-			{Address: "127.0.0.1:1883", Subscribe: []string{"*"}},
+		Servers: []*Server{
+			&Server{Address: "127.0.0.1:1883", Subscribe: []string{"*"}},
 		},
 	}
 }
@@ -86,14 +91,12 @@ func (p *Plugin) ValidateAndSetConfig(c interface{}) error {
 	config := c.(*Config)
 
 	// If listeners are configured, shut them down and start fresh
-	if p.clients != nil {
-		for _, client := range p.clients {
-			if client == nil || !client.IsConnected() {
-				continue
-			}
-
-			go client.Disconnect(500)
+	for _, client := range p.clients {
+		if client == nil || !client.IsConnected() {
+			continue
 		}
+
+		go client.Disconnect(500)
 	}
 
 	p.clients = make([]mqtt.Client, len(config.Servers))
@@ -102,6 +105,9 @@ func (p *Plugin) ValidateAndSetConfig(c interface{}) error {
 		if server.Address == "" {
 			return ErrInvalidAddress
 		}
+		if server.ClientID == "" {
+			server.ClientID = "gotify-" + randString()
+		}
 	}
 
 	p.config = config
@@ -165,11 +171,11 @@ func (p *Plugin) handleMessage(client mqtt.Client, message mqtt.Message) {
 }
 
 // newClient creates a new client from the serverConfig
-func (p *Plugin) newClient(serverConfig Server) (mqtt.Client, error) {
+func (p *Plugin) newClient(serverConfig *Server) (mqtt.Client, error) {
 	opts := mqtt.NewClientOptions()
 
 	opts.AddBroker(serverConfig.Address)
-	opts.SetClientID("gotify")
+	opts.SetClientID(serverConfig.ClientID)
 
 	if serverConfig.Username != "" {
 		opts.SetUsername(serverConfig.Username)
@@ -192,8 +198,18 @@ func (p *Plugin) newClient(serverConfig Server) (mqtt.Client, error) {
 	return client, nil
 }
 
+func randString() string {
+	letterRunes := []rune("0123456789abcdef")
+	b := make([]rune, 16)
+	for i := range b {
+		b[i] = letterRunes[rand.Intn(len(letterRunes))]
+	}
+	return string(b)
+}
+
 // NewGotifyPluginInstance creates a plugin instance for a user context.
 func NewGotifyPluginInstance(ctx plugin.UserContext) plugin.Plugin {
+	rand.Seed(time.Now().UnixNano())
 	return &Plugin{
 		userCtx: ctx,
 		clients: make([]mqtt.Client, 0),