Implemented websocket in server

Author: ybizeul

go.mod

@@ -5,17 +5,19 @@ go 1.21
 require (
 	github.com/Appboy/webpush-go v0.0.0-20221006204155-f206645c3cb7
 	github.com/davecgh/go-spew v1.1.1
+	github.com/go-chi/chi v1.5.4
 	github.com/go-chi/chi/v5 v5.0.10
 	github.com/google/uuid v1.3.0
+	github.com/gorilla/websocket v1.5.1
 	github.com/urfave/cli/v2 v2.25.7
 	golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb
 )
 
 require (
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
-	github.com/go-chi/chi v1.5.4 // indirect
 	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
-	golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613 // indirect
+	golang.org/x/crypto v0.14.0 // indirect
+	golang.org/x/net v0.17.0 // indirect
 )

go.sum

@@ -12,13 +12,18 @@ github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keL
 github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY=
+github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/urfave/cli/v2 v2.25.7 h1:VAzn5oq403l5pHjc4OhD54+XGO9cdKVL/7lDjF+iKUs=
 github.com/urfave/cli/v2 v2.25.7/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
-golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613 h1:MQ/ZZiDsUapFFiMS+vzwXkCTeEKaum+Do5rINYJDmxc=
 golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
 golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb h1:mIKbk8weKhSeLH2GmUTrvx8CjkyJmnU1wFmg59CUjFA=
 golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=

internal/feed/feed.go

@@ -3,17 +3,14 @@ package feed
 import (
 	"fmt"
 	"io"
-	"io/fs"
 	"net/http"
 	"net/url"
 	"os"
 	"path"
 	"path/filepath"
-	"sort"
 	"strings"
 	"time"
 
-	"github.com/google/uuid"
 	"golang.org/x/exp/slog"
 )
 
@@ -46,8 +43,9 @@ type PublicFeed struct {
 // Feed is the internal representation of a Feed and contains all the
 // informations needed to perform its tasks
 type Feed struct {
-	Path   string
-	Config FeedConfig
+	Path             string
+	Config           FeedConfig
+	WebSocketManager *WebSocketManager
 }
 
 type PublicFeedItem struct {
@@ -57,141 +55,42 @@ type PublicFeedItem struct {
 	Feed *PublicFeed  `json:"-"`
 }
 
-func NewFeed(basePath string, feedName string) (*Feed, error) {
-	slog.Info("Creating new feed", slog.String("feed", feedName))
-	feedPath := path.Join(basePath, feedName)
-
-	_, err := os.Stat(feedPath)
-	if err == nil {
-		return nil, &FeedError{
-			Code:    400,
-			Message: "Feed already exists",
-		}
-	}
-
-	err = os.Mkdir(feedPath, 0700)
-	if err != nil {
-		slog.Error("Error creating feed directory", slog.String("feed", feedName), slog.String("directory", feedPath))
-		return nil, err
-	}
-
-	feed := Feed{
-		Path: feedPath,
-		Config: FeedConfig{
-			Secret: uuid.NewString(),
-		},
-	}
-
-	feed.Config.feed = &feed
-
-	err = feed.Config.Write()
-
-	if err != nil {
-		slog.Error("Unable to write config %s", err.Error())
-		return nil, err
-	}
-
-	return &feed, nil
+func (feed *Feed) Name() string {
+	return path.Base(feed.Path)
 }
-func GetFeed(feedPath string) (*Feed, error) {
-	if _, err := os.Stat(feedPath); os.IsNotExist(err) {
-		return nil, &FeedError{
-			Code:    404,
-			Message: "Feed does not exists",
-		}
-	}
+func (feed *Feed) GetPublicItem(i string) (*PublicFeedItem, error) {
+	feedLog := slog.Default().With(slog.String("feed", feed.Name()))
 
-	result := &Feed{Path: feedPath}
+	s, err := os.Stat(path.Join(feed.Path, i))
 
-	c, err := FeedConfigForFeed(result)
 	if err != nil {
-		return nil, &FeedError{
-			Code:    404,
-			Message: "Feed does not exists",
-		}
-	}
-	c.feed = result
-
-	result.Config = *c
-
-	return result, nil
-}
-
-func GetPublicFeed(basePath string, feedName string, secret string) (*PublicFeed, error) {
-	feedPath := path.Join(basePath, feedName)
-
-	feedLog := slog.Default().With(slog.String("feed", feedName))
-
-	feedLog.Debug("Getting feed", slog.Int("secret_len", len(secret)))
-
-	f, err := GetFeed(feedPath)
+		code := 500
+		e := "Unable to read file info"
 
-	err = f.IsSecretValid(secret)
+		feedLog.Error(e, slog.Int("return", code))
 
-	if err != nil {
 		return nil, err
 	}
 
-	publicFeed := &PublicFeed{
-		Name:   feedName,
-		Secret: f.Config.Secret,
-	}
-	var d []fs.DirEntry
-	if d, err = os.ReadDir(feedPath); err != nil {
-		code := 500
-		feedLog.Error("Unable to feed content", slog.Int("return", code))
-
-		return nil, &FeedError{
-			Code:    code,
-			Message: "Unable to open directory for read",
-		}
-	}
-
-	items := []PublicFeedItem{}
-	for _, f := range d {
-		if f.Name() == "secret" || f.Name() == "pin" || f.Name() == "config.json" {
-			continue
-		}
-		info, err := f.Info()
-		if err != nil {
-			code := 500
-			e := "Unable to read file info"
-
-			feedLog.Error(e, slog.Int("return", code))
-
-			return nil, &FeedError{
-				Code:    code,
-				Message: e,
-			}
-		}
-
-		var itemType FeedItemType
-		if strings.HasSuffix(f.Name(), ".txt") {
-			itemType = Text
-		} else if strings.HasSuffix(f.Name(), ".png") || strings.HasSuffix(f.Name(), ".jpg") {
-			itemType = Image
-		} else {
-			itemType = Binary
-		}
-		items = append(items, PublicFeedItem{
-			Name: f.Name(),
-			Date: info.ModTime(),
-			Type: itemType,
-			Feed: publicFeed,
-		})
+	var itemType FeedItemType
+	if strings.HasSuffix(i, ".txt") {
+		itemType = Text
+	} else if strings.HasSuffix(i, ".png") || strings.HasSuffix(i, ".jpg") {
+		itemType = Image
+	} else {
+		itemType = Binary
 	}
-	sort.Slice(items, func(i, j2 int) bool {
-		return items[i].Date.After(items[j2].Date)
-	})
-
-	publicFeed.Items = items
-
-	return publicFeed, nil
-}
-func (feed *Feed) Name() string {
-	return path.Base(feed.Path)
+	return &PublicFeedItem{
+		Name: i,
+		Date: s.ModTime(),
+		Type: itemType,
+		Feed: &PublicFeed{
+			Name:   feed.Name(),
+			Secret: feed.Config.Secret,
+		},
+	}, nil
 }
-func (feed *Feed) GetItem(item string) ([]byte, error) {
+func (feed *Feed) GetItemData(item string) ([]byte, error) {
 	// Read item content
 	slog.Info("Getting Item", slog.String("feed", feed.Name()), slog.String("name", item))
 	var content []byte
@@ -241,8 +140,8 @@ func (feed *Feed) IsSecretValid(secret string) error {
 	return nil
 }
 
-func (feed *Feed) AddItem(contentType string, f io.ReadCloser) error {
-	slog.Debug("Adding Item", slog.String("feed", feed.Name()), slog.String("content-type", contentType))
+func (f *Feed) AddItem(contentType string, r io.ReadCloser) error {
+	slog.Debug("Adding Item", slog.String("feed", f.Name()), slog.String("content-type", contentType))
 	fileExtensions := map[string]string{
 		"image/png":  "png",
 		"image/jpeg": "jpg",
@@ -265,7 +164,7 @@ func (feed *Feed) AddItem(contentType string, f io.ReadCloser) error {
 		}
 	}
 
-	content, err := io.ReadAll(f)
+	content, err := io.ReadAll(r)
 	if err != nil {
 		_, ok := err.(*http.MaxBytesError)
 		if ok {
@@ -291,7 +190,7 @@ func (feed *Feed) AddItem(contentType string, f io.ReadCloser) error {
 	var filename string
 	for {
 		filename = fmt.Sprintf("%s %d", template, fileIndex)
-		matches, err := filepath.Glob(path.Join(feed.Path, filename) + ".*")
+		matches, err := filepath.Glob(path.Join(f.Path, filename) + ".*")
 		if err != nil {
 			return &FeedError{
 				Code:    500,
@@ -304,24 +203,45 @@ func (feed *Feed) AddItem(contentType string, f io.ReadCloser) error {
 		fileIndex++
 	}
 
-	err = os.WriteFile(path.Join(feed.Path, filename+"."+ext), content, 0600)
+	err = os.WriteFile(path.Join(f.Path, filename+"."+ext), content, 0600)
 	if err != nil {
 		return &FeedError{
 			Code:    500,
 			Message: "Unable to write file",
 		}
 	}
 
-	slog.Info("Added Item", slog.String("name", filename+"."+ext), slog.String("feed", feed.Path), slog.String("content-type", contentType))
+	publicItem, err := f.GetPublicItem(filename + "." + ext)
+
+	if err != nil {
+		return err.(*FeedError)
+	}
+
+	if err = f.WebSocketManager.NotifyAdd(publicItem); err != nil {
+		return &FeedError{
+			Code:    500,
+			Message: err.Error(),
+		}
+	}
+
+	slog.Info("Added Item", slog.String("name", filename+"."+ext), slog.String("feed", f.Path), slog.String("content-type", contentType))
 
 	return nil
 }
 
-func (feed *Feed) RemoveItem(item string) error {
-	slog.Debug("Remove Item", slog.String("name", item), slog.String("feed", feed.Path))
-	itemPath := path.Join(feed.Path, item)
+func (f *Feed) RemoveItem(item string) error {
+	slog.Debug("Remove Item", slog.String("name", item), slog.String("feed", f.Path))
+	itemPath := path.Join(f.Path, item)
 
-	err := os.Remove(itemPath)
+	publicItem, err := f.GetPublicItem(item)
+	if err != nil {
+		return &FeedError{
+			Code:    500,
+			Message: err.Error(),
+		}
+	}
+
+	err = os.Remove(itemPath)
 	if err != nil {
 		if os.IsNotExist(err) {
 			return &FeedError{
@@ -334,7 +254,15 @@ func (feed *Feed) RemoveItem(item string) error {
 			Message: err.Error(),
 		}
 	}
-	slog.Info("Removed Item", slog.String("name", item), slog.String("feed", feed.Name()))
+
+	if err = f.WebSocketManager.NotifyRemove(publicItem); err != nil {
+		return &FeedError{
+			Code:    500,
+			Message: err.Error(),
+		}
+	}
+
+	slog.Info("Removed Item", slog.String("name", item), slog.String("feed", f.Name()))
 	return nil
 }
 

internal/feed/feedConfig.go

@@ -66,7 +66,10 @@ func FeedConfigForFeed(f *Feed) (*FeedConfig, error) {
 
 	configPath := path.Join(f.Path, "config.json")
 	if _, err := os.Stat(configPath); errors.Is(err, os.ErrNotExist) {
-		result.migratev1v2()
+		if err := result.migratev1v2(); err != nil {
+			return nil, err
+		}
+
 	}
 	b, err := os.ReadFile(configPath)
 	if err != nil {