unifiedpush distributor test

WARNING BAD CODE for now

cmd/app.go

@@ -32,6 +32,7 @@ func New() *cli.App {
 			cmdServe,
 			cmdPublish,
 			cmdSubscribe,
+			cmdDistribute,
 		},
 	}
 }

cmd/distributor.go

@@ -0,0 +1,201 @@
+package cmd
+
+import (
+	"errors"
+	"fmt"
+	"log"
+	"strings"
+
+	"github.com/urfave/cli/v2"
+	"gorm.io/gorm"
+	"gorm.io/gorm/clause"
+	"heckel.io/ntfy/client"
+
+	distributor_tools "unifiedpush.org/go/np2p_dbus/distributor"
+	"unifiedpush.org/go/np2p_dbus/storage"
+	"unifiedpush.org/go/np2p_dbus/utils"
+)
+
+type store struct {
+	storage.Storage
+}
+
+func (s store) GetAllPubTokens() string {
+	var conns []storage.Connection
+	result := s.DB().Find(&conns)
+	if result.Error != nil {
+		//TODO
+	}
+	pubtokens := []string{}
+	for _, conn := range conns {
+		pubtokens = append(pubtokens, conn.PublicToken)
+	}
+
+	return strings.Join(pubtokens, ",")
+}
+
+type KVStore struct {
+	Key   string `gorm:"primaryKey"`
+	Value string
+}
+
+func (kv *KVStore) Get(db *gorm.DB) error {
+	return db.First(kv).Error
+}
+
+func (kv KVStore) Set(db *gorm.DB) error {
+	return db.Clauses(clause.OnConflict{UpdateAll: true}).Create(&kv).Error
+}
+
+func (s store) SetLastMessage(id string) error {
+	return KVStore{"device-id", id}.Set(s.DB())
+}
+
+func (s store) GetLastMessage() string {
+	answer := KVStore{Key: "device-id"}
+	if err := answer.Get(s.DB()); err != nil {
+		//log or fatal??
+		return "100"
+	}
+	return answer.Value
+}
+
+var cmdDistribute = &cli.Command{
+	Name:      "distribute",
+	Aliases:   []string{"dist"},
+	Usage:     "Start the UnifiedPush distributor",
+	UsageText: "ntfy distribute",
+	Action:    execDistribute,
+	Flags: []cli.Flag{
+		&cli.StringFlag{Name: "config", Aliases: []string{"c"}, Usage: "client config file"},
+		&cli.BoolFlag{Name: "verbose", Aliases: []string{"v"}, Usage: "print verbose output"},
+	},
+	Description: `TODO`,
+}
+
+func execDistribute(c *cli.Context) error {
+
+	// this channel will resubscribe to the server whenever an app is added or removed
+	resubscribe := make(chan struct{})
+
+	// Read config
+	conf, err := loadConfig(c)
+	if err != nil {
+		return err
+	}
+
+	distrib := newDistributor(conf, resubscribe)
+
+	cl := client.New(conf)
+
+	go distrib.handleEndpointSettingsChanges()
+	go distrib.handleDistribution(cl)
+
+	var sub string
+	// everytime resubscribe is triggered, this loop will unsubscribe from the old subscription
+	// and resubscribe to one with the new list of topics/applications
+	// On the first run, 'sub' is empty but cl.Unsubscribe doesn't care.
+	// the first message to resubscribe (trigerring the first loop run) is sent by handleEndpointSettingsChanges
+	for _ = range resubscribe {
+		cl.Unsubscribe(sub)
+
+		fmt.Println("Subscribing...")
+		subscribeTopics := distrib.st.GetAllPubTokens()
+		if subscribeTopics == "" {
+			continue
+		}
+		sub = cl.Subscribe(subscribeTopics, client.WithSince(distrib.st.GetLastMessage()))
+	}
+
+	return nil
+}
+
+// creates a new distributor object with an initialized storage and dbus
+func newDistributor(conf *client.Config, resub chan struct{}) (d distributor) {
+	st, err := storage.InitStorage(utils.StoragePath("ntfy.db"))
+	st.DB().AutoMigrate(KVStore{}) //todo move to proper function
+	if err != nil {
+		log.Fatalln("failed to connect database")
+	}
+
+	dbus := distributor_tools.NewDBus("org.unifiedpush.Distributor.ntfy")
+	d = distributor{dbus, store{*st}, conf, resub}
+	err = dbus.StartHandling(d)
+	fmt.Println("DBUS HANDLING")
+	if err != nil {
+		log.Fatalln("failed to connect to dbus")
+	}
+
+	return
+}
+
+type distributor struct {
+	dbus  *distributor_tools.DBus
+	st    store
+	conf  *client.Config
+	resub chan struct{}
+}
+
+// handleEndpointSettingsChanges runs on every start and
+// checks if the new configuration server is different from previously.
+// If so, it re-registers the apps which have the old info.
+func (d distributor) handleEndpointSettingsChanges() {
+	endpointFormat := d.fillInURL("<token>")
+	for _, i := range d.st.GetUnequalSettings(endpointFormat) {
+		utils.Log.Debugln("new endpoint format for", i.AppID, i.AppToken)
+		//newconnection updates the endpoint settings when one already exists
+		n := d.st.NewConnection(i.AppID, i.AppToken, endpointFormat)
+		if n == nil || n.Settings != endpointFormat {
+			utils.Log.Debugln("unable to save new endpoint format for", i.AppID, i.AppToken)
+			continue
+		}
+		d.dbus.NewConnector(n.AppID).NewEndpoint(n.AppToken, d.fillInURL(n.PublicToken))
+	}
+	d.resub <- struct{}{}
+}
+
+// handleDistribution listens to the nfty client and forwards messages to the right dbus app based on the db.
+func (d distributor) handleDistribution(cl *client.Client) {
+	for i := range cl.Messages {
+		conn := d.st.GetConnectionbyPublic(i.Topic)
+		if conn != nil {
+			_ = d.dbus.NewConnector(conn.AppID).Message(conn.AppToken, i.Message, "")
+		}
+		d.st.SetLastMessage(fmt.Sprintf("%d", i.Time))
+	}
+}
+
+// Register handles an app's call to register for a new connection
+// this creates a new connection in the db and triggers a resubscribe with that id
+// then it returns the endpoint with that new token to dbus
+func (d distributor) Register(appName, token string) (string, string, error) {
+	fmt.Println(appName, "registration request")
+	conn := d.st.NewConnection(appName, token, d.fillInURL("<token>"))
+	fmt.Println("registered", conn)
+	if conn != nil {
+		d.resub <- struct{}{}
+		return d.fillInURL(conn.PublicToken), "", nil
+	}
+	//np2p doesn't have a situation for refuse
+	return "", "", errors.New("Unknown error with NoProvider2Push")
+}
+
+// Unregister handles an app's unregister request
+// It deletes the connection in the database and triggers a resubscribe
+func (d distributor) Unregister(token string) {
+	deletedConn, err := d.st.DeleteConnection(token)
+	utils.Log.Debugln("deleted", deletedConn)
+
+	if err != nil {
+		//?????
+	}
+	_ = d.dbus.NewConnector(deletedConn.AppID).Unregistered(deletedConn.AppToken)
+
+	d.resub <- struct{}{}
+
+}
+
+// Fills in the default host to and app token to make UnifiedPush endpoints
+func (d distributor) fillInURL(token string) string {
+	return fmt.Sprintf("%s/%s?up=1", d.conf.DefaultHost, token)
+}