feat: direct call download api by cgo

cmd/api/main.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"github.com/GopeedLab/gopeed/cmd"
-	"github.com/GopeedLab/gopeed/pkg/rest/model"
+	"github.com/GopeedLab/gopeed/pkg/api/model"
 )
 
 // only for local development

cmd/server.go

@@ -3,10 +3,9 @@ package cmd
 import (
 	_ "embed"
 	"fmt"
+	"github.com/GopeedLab/gopeed/pkg/api"
+	"github.com/GopeedLab/gopeed/pkg/api/model"
 	"github.com/GopeedLab/gopeed/pkg/base"
-	"github.com/GopeedLab/gopeed/pkg/rest"
-	"github.com/GopeedLab/gopeed/pkg/rest/model"
-	"net/http"
 	"os"
 	"os/signal"
 	"path/filepath"
@@ -18,20 +17,21 @@ var banner string
 
 func Start(cfg *model.StartConfig) {
 	fmt.Println(banner)
-	srv, listener, err := rest.BuildServer(cfg)
+	instance, err := api.Create(cfg)
 	if err != nil {
 		panic(err)
 	}
-	downloadCfg, err := rest.Downloader.GetConfig()
-	if err != nil {
-		panic(err)
+	downloadCfgResult := instance.GetConfig()
+	if downloadCfgResult.HasError() {
+		panic(downloadCfgResult.Msg)
 	}
+	downloadCfg := downloadCfgResult.Data
 	if downloadCfg.FirstLoad {
 		// Set default download config
 		if cfg.DownloadConfig != nil {
 			cfg.DownloadConfig.Merge(downloadCfg)
 			// TODO Use PatchConfig
-			rest.Downloader.PutConfig(cfg.DownloadConfig)
+			instance.PutConfig(cfg.DownloadConfig)
 			downloadCfg = cfg.DownloadConfig
 		}
 
@@ -48,25 +48,26 @@ func Start(cfg *model.StartConfig) {
 			}
 			if downloadDir != "" {
 				downloadCfg.DownloadDir = downloadDir
-				rest.Downloader.PutConfig(downloadCfg)
+				instance.PutConfig(downloadCfg)
 			}
 		}
 	}
-	watchExit()
-
-	fmt.Printf("Server start success on http://%s\n", listener.Addr().String())
-	if err := srv.Serve(listener); err != nil && err != http.ErrServerClosed {
-		panic(err)
+	startResult := instance.Start()
+	if startResult.HasError() {
+		panic(startResult.Msg)
 	}
+	fmt.Printf("Server start success on http://%s:%s\n", startResult.Data.Host, startResult.Data.Port)
+
+	watchExit(instance)
 }
 
-func watchExit() {
+func watchExit(instance *api.Instance) {
 	sigs := make(chan os.Signal, 1)
 	signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
 	go func() {
 		sig := <-sigs
 		fmt.Printf("Server is shutting down due to signal: %s\n", sig)
-		rest.Downloader.Close()
+		instance.Stop()
 		os.Exit(0)
 	}()
 }

cmd/web/flags.go

@@ -10,7 +10,7 @@ import (
 )
 
 type args struct {
-	Address    *string `json:"address"`
+	Host       *string `json:"host"`
 	Port       *int    `json:"port"`
 	Username   *string `json:"username"`
 	Password   *string `json:"password"`
@@ -24,7 +24,7 @@ type args struct {
 
 func parse() *args {
 	var cliArgs args
-	cliArgs.Address = flag.String("A", "0.0.0.0", "Bind Address")
+	cliArgs.Host = flag.String("H", "0.0.0.0", "Bind Host")
 	cliArgs.Port = flag.Int("P", 9999, "Bind Port")
 	cliArgs.Username = flag.String("u", "gopeed", "HTTP Basic Auth Username")
 	cliArgs.Password = flag.String("p", "", "HTTP Basic Auth Pwd")

cmd/web/main.go

@@ -5,9 +5,9 @@ package main
 
 import (
 	"embed"
-	"fmt"
 	"github.com/GopeedLab/gopeed/cmd"
-	"github.com/GopeedLab/gopeed/pkg/rest/model"
+	"github.com/GopeedLab/gopeed/pkg/api/model"
+	"github.com/GopeedLab/gopeed/pkg/base"
 	"io/fs"
 	"os"
 	"path/filepath"
@@ -42,12 +42,18 @@ func main() {
 		dir = filepath.Dir(exe)
 	}
 
+	if args.DownloadConfig == nil {
+		args.DownloadConfig = &base.DownloaderStoreConfig{}
+	}
+	args.DownloadConfig.Http = &base.DownloaderHttpConfig{
+		Host:     *args.Host,
+		Port:     *args.Port,
+		ApiToken: *args.ApiToken,
+	}
+
 	cfg := &model.StartConfig{
-		Network:        "tcp",
-		Address:        fmt.Sprintf("%s:%d", *args.Address, *args.Port),
 		Storage:        model.StorageBolt,
 		StorageDir:     filepath.Join(dir, "storage"),
-		ApiToken:       *args.ApiToken,
 		DownloadConfig: args.DownloadConfig,
 		ProductionMode: true,
 		WebEnable:      true,