Merge branch 'PluginTimeout' into dev

Author: Neko-Box-Coder

internal/config/plugin_installer.go

@@ -12,6 +12,7 @@ import (
 	"sort"
 	"strings"
 	"sync"
+	"time"
 
 	"github.com/blang/semver"
 	lua "github.com/yuin/gopher-lua"
@@ -126,9 +127,12 @@ func (pc PluginChannels) Fetch(out io.Writer) PluginPackages {
 
 // Fetch retrieves all available PluginPackages from the given channel
 func (pc PluginChannel) Fetch(out io.Writer) PluginPackages {
-	resp, err := http.Get(string(pc))
+	client := http.Client {
+		Timeout: 10 * time.Second,
+	}
+	resp, err := client.Get(string(pc))
 	if err != nil {
-		fmt.Fprintln(out, "Failed to query plugin channel:\n", err)
+		fmt.Fprintln(out, "Failed to query plugin channel ", pc, " with error:\n", err)
 		return PluginPackages{}
 	}
 	defer resp.Body.Close()
@@ -146,17 +150,20 @@ func (pc PluginChannel) Fetch(out io.Writer) PluginPackages {
 
 // Fetch retrieves all available PluginPackages from the given repository
 func (pr PluginRepository) Fetch(out io.Writer) PluginPackages {
-	resp, err := http.Get(string(pr))
+	client := http.Client {
+		Timeout: 10 * time.Second,
+	}
+	resp, err := client.Get(string(pr))
 	if err != nil {
-		fmt.Fprintln(out, "Failed to query plugin repository:\n", err)
+		fmt.Fprintln(out, "Failed to query plugin repository", pr)
 		return PluginPackages{}
 	}
 	defer resp.Body.Close()
 	decoder := json5.NewDecoder(resp.Body)
 
 	var plugins PluginPackages
 	if err := decoder.Decode(&plugins); err != nil {
-		fmt.Fprintln(out, "Failed to decode repository data:\n", err)
+		fmt.Fprintln(out, "Failed to decode repository data for", pr, "with error:\n", err)
 		return PluginPackages{}
 	}
 	if len(plugins) > 0 {
@@ -391,7 +398,10 @@ func GetInstalledPluginVersion(name string) string {
 // DownloadAndInstall downloads and installs the given plugin and version
 func (pv *PluginVersion) DownloadAndInstall(out io.Writer) error {
 	fmt.Fprintf(out, "Downloading %q (%s) from %q\n", pv.pack.Name, pv.Version, pv.Url)
-	resp, err := http.Get(pv.Url)
+	client := http.Client {
+		Timeout: 10 * time.Second,
+	}
+	resp, err := client.Get(pv.Url)
 	if err != nil {
 		return err
 	}