Refactor packages to have more idiomatic code base

3 files changed, 274 insertions, 0 deletions

diff --git a/daemon/daemon.go b/daemon/daemon.go
new file mode 100644
index 0000000..494e035
--- /dev/null
+++ b/daemon/daemon.go
@@ -0,0 +1,46 @@
+// Copyright 2018 Frédéric Guillot. All rights reserved.
+// Use of this source code is governed by the Apache 2.0
+// license that can be found in the LICENSE file.
+
+package daemon
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"time"
+
+	"github.com/miniflux/miniflux/config"
+	"github.com/miniflux/miniflux/logger"
+	"github.com/miniflux/miniflux/reader/feed"
+	"github.com/miniflux/miniflux/scheduler"
+	"github.com/miniflux/miniflux/storage"
+)
+
+// Run starts the daemon.
+func Run(cfg *config.Config, store *storage.Storage) {
+	logger.Info("Starting Miniflux...")
+
+	stop := make(chan os.Signal, 1)
+	signal.Notify(stop, os.Interrupt)
+
+	feedHandler := feed.NewFeedHandler(store)
+	pool := scheduler.NewWorkerPool(feedHandler, cfg.GetInt("WORKER_POOL_SIZE", config.DefaultWorkerPoolSize))
+	server := newServer(cfg, store, pool, feedHandler)
+
+	scheduler.NewFeedScheduler(
+		store,
+		pool,
+		cfg.GetInt("POLLING_FREQUENCY", config.DefaultPollingFrequency),
+		cfg.GetInt("BATCH_SIZE", config.DefaultBatchSize),
+	)
+
+	scheduler.NewSessionScheduler(store, config.DefaultSessionCleanupFrequency)
+
+	<-stop
+	logger.Info("Shutting down the server...")
+	ctx, _ := context.WithTimeout(context.Background(), 5*time.Second)
+	server.Shutdown(ctx)
+	store.Close()
+	logger.Info("Server gracefully stopped")
+}
diff --git a/daemon/routes.go b/daemon/routes.go
new file mode 100644
index 0000000..0c266f4
--- /dev/null
+++ b/daemon/routes.go
@@ -0,0 +1,165 @@
+// Copyright 2018 Frédéric Guillot. All rights reserved.
+// Use of this source code is governed by the Apache 2.0
+// license that can be found in the LICENSE file.
+
+package daemon
+
+import (
+	"net/http"
+
+	"github.com/miniflux/miniflux/api"
+	"github.com/miniflux/miniflux/config"
+	"github.com/miniflux/miniflux/fever"
+	"github.com/miniflux/miniflux/http/handler"
+	"github.com/miniflux/miniflux/http/middleware"
+	"github.com/miniflux/miniflux/locale"
+	"github.com/miniflux/miniflux/reader/feed"
+	"github.com/miniflux/miniflux/reader/opml"
+	"github.com/miniflux/miniflux/scheduler"
+	"github.com/miniflux/miniflux/storage"
+	"github.com/miniflux/miniflux/template"
+	"github.com/miniflux/miniflux/ui"
+
+	"github.com/gorilla/mux"
+)
+
+func routes(cfg *config.Config, store *storage.Storage, feedHandler *feed.Handler, pool *scheduler.WorkerPool) *mux.Router {
+	router := mux.NewRouter()
+	translator := locale.Load()
+	templateEngine := template.NewEngine(cfg, router, translator)
+
+	apiController := api.NewController(store, feedHandler)
+	feverController := fever.NewController(store)
+	uiController := ui.NewController(cfg, store, pool, feedHandler, opml.NewHandler(store))
+
+	apiHandler := handler.NewHandler(cfg, store, router, templateEngine, translator, middleware.NewChain(
+		middleware.NewBasicAuthMiddleware(store).Handler,
+	))
+
+	feverHandler := handler.NewHandler(cfg, store, router, templateEngine, translator, middleware.NewChain(
+		middleware.NewFeverMiddleware(store).Handler,
+	))
+
+	uiHandler := handler.NewHandler(cfg, store, router, templateEngine, translator, middleware.NewChain(
+		middleware.NewUserSessionMiddleware(store, router).Handler,
+		middleware.NewSessionMiddleware(cfg, store).Handler,
+	))
+
+	router.Handle("/fever/", feverHandler.Use(feverController.Handler))
+
+	router.Handle("/v1/users", apiHandler.Use(apiController.CreateUser)).Methods("POST")
+	router.Handle("/v1/users", apiHandler.Use(apiController.Users)).Methods("GET")
+	router.Handle("/v1/users/{userID:[0-9]+}", apiHandler.Use(apiController.UserByID)).Methods("GET")
+	router.Handle("/v1/users/{userID:[0-9]+}", apiHandler.Use(apiController.UpdateUser)).Methods("PUT")
+	router.Handle("/v1/users/{userID:[0-9]+}", apiHandler.Use(apiController.RemoveUser)).Methods("DELETE")
+	router.Handle("/v1/users/{username}", apiHandler.Use(apiController.UserByUsername)).Methods("GET")
+
+	router.Handle("/v1/categories", apiHandler.Use(apiController.CreateCategory)).Methods("POST")
+	router.Handle("/v1/categories", apiHandler.Use(apiController.GetCategories)).Methods("GET")
+	router.Handle("/v1/categories/{categoryID}", apiHandler.Use(apiController.UpdateCategory)).Methods("PUT")
+	router.Handle("/v1/categories/{categoryID}", apiHandler.Use(apiController.RemoveCategory)).Methods("DELETE")
+
+	router.Handle("/v1/discover", apiHandler.Use(apiController.GetSubscriptions)).Methods("POST")
+
+	router.Handle("/v1/feeds", apiHandler.Use(apiController.CreateFeed)).Methods("POST")
+	router.Handle("/v1/feeds", apiHandler.Use(apiController.GetFeeds)).Methods("Get")
+	router.Handle("/v1/feeds/{feedID}/refresh", apiHandler.Use(apiController.RefreshFeed)).Methods("PUT")
+	router.Handle("/v1/feeds/{feedID}", apiHandler.Use(apiController.GetFeed)).Methods("GET")
+	router.Handle("/v1/feeds/{feedID}", apiHandler.Use(apiController.UpdateFeed)).Methods("PUT")
+	router.Handle("/v1/feeds/{feedID}", apiHandler.Use(apiController.RemoveFeed)).Methods("DELETE")
+	router.Handle("/v1/feeds/{feedID}/icon", apiHandler.Use(apiController.FeedIcon)).Methods("GET")
+
+	router.Handle("/v1/feeds/{feedID}/entries", apiHandler.Use(apiController.GetFeedEntries)).Methods("GET")
+	router.Handle("/v1/feeds/{feedID}/entries/{entryID}", apiHandler.Use(apiController.GetFeedEntry)).Methods("GET")
+	router.Handle("/v1/entries", apiHandler.Use(apiController.GetEntries)).Methods("GET")
+	router.Handle("/v1/entries", apiHandler.Use(apiController.SetEntryStatus)).Methods("PUT")
+	router.Handle("/v1/entries/{entryID}", apiHandler.Use(apiController.GetEntry)).Methods("GET")
+	router.Handle("/v1/entries/{entryID}/bookmark", apiHandler.Use(apiController.ToggleBookmark)).Methods("PUT")
+
+	router.Handle("/stylesheets/{name}.css", uiHandler.Use(uiController.Stylesheet)).Name("stylesheet").Methods("GET")
+	router.Handle("/js", uiHandler.Use(uiController.Javascript)).Name("javascript").Methods("GET")
+	router.Handle("/favicon.ico", uiHandler.Use(uiController.Favicon)).Name("favicon").Methods("GET")
+	router.Handle("/icon/{filename}", uiHandler.Use(uiController.AppIcon)).Name("appIcon").Methods("GET")
+	router.Handle("/manifest.json", uiHandler.Use(uiController.WebManifest)).Name("webManifest").Methods("GET")
+
+	router.Handle("/subscribe", uiHandler.Use(uiController.AddSubscription)).Name("addSubscription").Methods("GET")
+	router.Handle("/subscribe", uiHandler.Use(uiController.SubmitSubscription)).Name("submitSubscription").Methods("POST")
+	router.Handle("/subscriptions", uiHandler.Use(uiController.ChooseSubscription)).Name("chooseSubscription").Methods("POST")
+
+	router.Handle("/unread", uiHandler.Use(uiController.ShowUnreadPage)).Name("unread").Methods("GET")
+	router.Handle("/history", uiHandler.Use(uiController.ShowHistoryPage)).Name("history").Methods("GET")
+	router.Handle("/starred", uiHandler.Use(uiController.ShowStarredPage)).Name("starred").Methods("GET")
+
+	router.Handle("/feed/{feedID}/refresh", uiHandler.Use(uiController.RefreshFeed)).Name("refreshFeed").Methods("GET")
+	router.Handle("/feed/{feedID}/edit", uiHandler.Use(uiController.EditFeed)).Name("editFeed").Methods("GET")
+	router.Handle("/feed/{feedID}/remove", uiHandler.Use(uiController.RemoveFeed)).Name("removeFeed").Methods("POST")
+	router.Handle("/feed/{feedID}/update", uiHandler.Use(uiController.UpdateFeed)).Name("updateFeed").Methods("POST")
+	router.Handle("/feed/{feedID}/entries", uiHandler.Use(uiController.ShowFeedEntries)).Name("feedEntries").Methods("GET")
+	router.Handle("/feeds", uiHandler.Use(uiController.ShowFeedsPage)).Name("feeds").Methods("GET")
+	router.Handle("/feeds/refresh", uiHandler.Use(uiController.RefreshAllFeeds)).Name("refreshAllFeeds").Methods("GET")
+
+	router.Handle("/unread/entry/{entryID}", uiHandler.Use(uiController.ShowUnreadEntry)).Name("unreadEntry").Methods("GET")
+	router.Handle("/history/entry/{entryID}", uiHandler.Use(uiController.ShowReadEntry)).Name("readEntry").Methods("GET")
+	router.Handle("/history/flush", uiHandler.Use(uiController.FlushHistory)).Name("flushHistory").Methods("GET")
+	router.Handle("/feed/{feedID}/entry/{entryID}", uiHandler.Use(uiController.ShowFeedEntry)).Name("feedEntry").Methods("GET")
+	router.Handle("/category/{categoryID}/entry/{entryID}", uiHandler.Use(uiController.ShowCategoryEntry)).Name("categoryEntry").Methods("GET")
+	router.Handle("/starred/entry/{entryID}", uiHandler.Use(uiController.ShowStarredEntry)).Name("starredEntry").Methods("GET")
+
+	router.Handle("/entry/status", uiHandler.Use(uiController.UpdateEntriesStatus)).Name("updateEntriesStatus").Methods("POST")
+	router.Handle("/entry/save/{entryID}", uiHandler.Use(uiController.SaveEntry)).Name("saveEntry").Methods("POST")
+	router.Handle("/entry/download/{entryID}", uiHandler.Use(uiController.FetchContent)).Name("fetchContent").Methods("POST")
+	router.Handle("/entry/bookmark/{entryID}", uiHandler.Use(uiController.ToggleBookmark)).Name("toggleBookmark").Methods("POST")
+
+	router.Handle("/categories", uiHandler.Use(uiController.ShowCategories)).Name("categories").Methods("GET")
+	router.Handle("/category/create", uiHandler.Use(uiController.CreateCategory)).Name("createCategory").Methods("GET")
+	router.Handle("/category/save", uiHandler.Use(uiController.SaveCategory)).Name("saveCategory").Methods("POST")
+	router.Handle("/category/{categoryID}/entries", uiHandler.Use(uiController.ShowCategoryEntries)).Name("categoryEntries").Methods("GET")
+	router.Handle("/category/{categoryID}/edit", uiHandler.Use(uiController.EditCategory)).Name("editCategory").Methods("GET")
+	router.Handle("/category/{categoryID}/update", uiHandler.Use(uiController.UpdateCategory)).Name("updateCategory").Methods("POST")
+	router.Handle("/category/{categoryID}/remove", uiHandler.Use(uiController.RemoveCategory)).Name("removeCategory").Methods("POST")
+
+	router.Handle("/feed/icon/{iconID}", uiHandler.Use(uiController.ShowIcon)).Name("icon").Methods("GET")
+	router.Handle("/proxy/{encodedURL}", uiHandler.Use(uiController.ImageProxy)).Name("proxy").Methods("GET")
+
+	router.Handle("/users", uiHandler.Use(uiController.ShowUsers)).Name("users").Methods("GET")
+	router.Handle("/user/create", uiHandler.Use(uiController.CreateUser)).Name("createUser").Methods("GET")
+	router.Handle("/user/save", uiHandler.Use(uiController.SaveUser)).Name("saveUser").Methods("POST")
+	router.Handle("/users/{userID}/edit", uiHandler.Use(uiController.EditUser)).Name("editUser").Methods("GET")
+	router.Handle("/users/{userID}/update", uiHandler.Use(uiController.UpdateUser)).Name("updateUser").Methods("POST")
+	router.Handle("/users/{userID}/remove", uiHandler.Use(uiController.RemoveUser)).Name("removeUser").Methods("POST")
+
+	router.Handle("/about", uiHandler.Use(uiController.AboutPage)).Name("about").Methods("GET")
+
+	router.Handle("/settings", uiHandler.Use(uiController.ShowSettings)).Name("settings").Methods("GET")
+	router.Handle("/settings", uiHandler.Use(uiController.UpdateSettings)).Name("updateSettings").Methods("POST")
+
+	router.Handle("/bookmarklet", uiHandler.Use(uiController.Bookmarklet)).Name("bookmarklet").Methods("GET")
+	router.Handle("/integrations", uiHandler.Use(uiController.ShowIntegrations)).Name("integrations").Methods("GET")
+	router.Handle("/integration", uiHandler.Use(uiController.UpdateIntegration)).Name("updateIntegration").Methods("POST")
+
+	router.Handle("/sessions", uiHandler.Use(uiController.ShowSessions)).Name("sessions").Methods("GET")
+	router.Handle("/sessions/{sessionID}/remove", uiHandler.Use(uiController.RemoveSession)).Name("removeSession").Methods("POST")
+
+	router.Handle("/export", uiHandler.Use(uiController.Export)).Name("export").Methods("GET")
+	router.Handle("/import", uiHandler.Use(uiController.Import)).Name("import").Methods("GET")
+	router.Handle("/upload", uiHandler.Use(uiController.UploadOPML)).Name("uploadOPML").Methods("POST")
+
+	router.Handle("/oauth2/{provider}/unlink", uiHandler.Use(uiController.OAuth2Unlink)).Name("oauth2Unlink").Methods("GET")
+	router.Handle("/oauth2/{provider}/redirect", uiHandler.Use(uiController.OAuth2Redirect)).Name("oauth2Redirect").Methods("GET")
+	router.Handle("/oauth2/{provider}/callback", uiHandler.Use(uiController.OAuth2Callback)).Name("oauth2Callback").Methods("GET")
+
+	router.Handle("/login", uiHandler.Use(uiController.CheckLogin)).Name("checkLogin").Methods("POST")
+	router.Handle("/logout", uiHandler.Use(uiController.Logout)).Name("logout").Methods("GET")
+	router.Handle("/", uiHandler.Use(uiController.ShowLoginPage)).Name("login").Methods("GET")
+
+	router.HandleFunc("/healthcheck", func(w http.ResponseWriter, r *http.Request) {
+		w.Write([]byte("OK"))
+	})
+
+	router.HandleFunc("/robots.txt", func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("Content-Type", "text/plain")
+		w.Write([]byte("User-agent: *\nDisallow: /"))
+	})
+
+	return router
+}
diff --git a/daemon/server.go b/daemon/server.go
new file mode 100644
index 0000000..dfdfb79
--- /dev/null
+++ b/daemon/server.go
@@ -0,0 +1,63 @@
+// Copyright 2018 Frédéric Guillot. All rights reserved.
+// Use of this source code is governed by the Apache 2.0
+// license that can be found in the LICENSE file.
+
+package daemon
+
+import (
+	"crypto/tls"
+	"net/http"
+	"time"
+
+	"github.com/miniflux/miniflux/config"
+	"github.com/miniflux/miniflux/logger"
+	"github.com/miniflux/miniflux/reader/feed"
+	"github.com/miniflux/miniflux/scheduler"
+	"github.com/miniflux/miniflux/storage"
+
+	"golang.org/x/crypto/acme/autocert"
+)
+
+func newServer(cfg *config.Config, store *storage.Storage, pool *scheduler.WorkerPool, feedHandler *feed.Handler) *http.Server {
+	certFile := cfg.Get("CERT_FILE", config.DefaultCertFile)
+	keyFile := cfg.Get("KEY_FILE", config.DefaultKeyFile)
+	certDomain := cfg.Get("CERT_DOMAIN", config.DefaultCertDomain)
+	certCache := cfg.Get("CERT_CACHE", config.DefaultCertCache)
+	server := &http.Server{
+		ReadTimeout:  5 * time.Second,
+		WriteTimeout: 10 * time.Second,
+		IdleTimeout:  60 * time.Second,
+		Addr:         cfg.Get("LISTEN_ADDR", config.DefaultListenAddr),
+		Handler:      routes(cfg, store, feedHandler, pool),
+	}
+
+	if certDomain != "" && certCache != "" {
+		cfg.IsHTTPS = true
+		server.Addr = ":https"
+		certManager := autocert.Manager{
+			Cache:      autocert.DirCache(certCache),
+			Prompt:     autocert.AcceptTOS,
+			HostPolicy: autocert.HostWhitelist(certDomain),
+		}
+
+		go func() {
+			logger.Info(`Listening on "%s" by using auto-configured certificate for "%s"`, server.Addr, certDomain)
+			logger.Fatal(server.Serve(certManager.Listener()).Error())
+		}()
+	} else if certFile != "" && keyFile != "" {
+		server.TLSConfig = &tls.Config{MinVersion: tls.VersionTLS12}
+		cfg.IsHTTPS = true
+
+		go func() {
+			logger.Info(`Listening on "%s" by using certificate "%s" and key "%s"`, server.Addr, certFile, keyFile)
+			logger.Fatal(server.ListenAndServeTLS(certFile, keyFile).Error())
+		}()
+	} else {
+		go func() {
+			logger.Info(`Listening on "%s" without TLS`, server.Addr)
+			logger.Fatal(server.ListenAndServe().Error())
+		}()
+	}
+
+	return server
+}