add file server to tests http source + update examples to use http source

Author: creativeprojects

cmd/detect-latest-release/main.go

@@ -30,12 +30,13 @@ func usage() {
 
 func main() {
 	var help, verbose bool
-	var cvsType, forceOS, forceArch string
+	var cvsType, forceOS, forceArch, baseURL string
 	flag.BoolVar(&help, "h", false, "Show help")
 	flag.BoolVar(&verbose, "v", false, "Display debugging information")
-	flag.StringVar(&cvsType, "t", "auto", "Version control: \"github\", \"gitea\" or \"gitlab\"")
+	flag.StringVar(&cvsType, "t", "auto", "Version control: \"github\", \"gitea\", \"gitlab\" or \"http\"")
 	flag.StringVar(&forceOS, "o", "", "OS name to use (windows, darwin, linux, etc)")
 	flag.StringVar(&forceArch, "a", "", "CPU architecture to use (amd64, arm64, etc)")
+	flag.StringVar(&baseURL, "u", "", "Base URL for VCS on http or dedicated instances")
 
 	flag.Usage = usage
 	flag.Parse()
@@ -57,6 +58,10 @@ func main() {
 		os.Exit(1)
 	}
 
+	if domain == "" && baseURL != "" {
+		domain = baseURL
+	}
+
 	if verbose {
 		fmt.Printf("slug %q on domain %q\n", slug, domain)
 	}

cmd/get-release/main.go

@@ -19,10 +19,11 @@ import (
 
 func main() {
 	var help, verbose bool
-	var cvsType string
+	var cvsType, baseURL string
 	flag.BoolVar(&help, "h", false, "Show help")
 	flag.BoolVar(&verbose, "v", false, "Display debugging information")
-	flag.StringVar(&cvsType, "t", "auto", "Version control: \"github\", \"gitea\" or \"gitlab\"")
+	flag.StringVar(&cvsType, "t", "auto", "Version control: \"github\", \"gitea\", \"gitlab\" or \"http\"")
+	flag.StringVar(&baseURL, "u", "", "Base URL for VCS on http or dedicated instances")
 
 	flag.Usage = usage
 	flag.Parse()
@@ -44,6 +45,10 @@ func main() {
 		os.Exit(1)
 	}
 
+	if domain == "" && baseURL != "" {
+		domain = baseURL
+	}
+
 	if verbose {
 		fmt.Printf("slug %q on domain %q\n", slug, domain)
 	}

cmd/serve-repo/logger.go

@@ -0,0 +1,59 @@
+package main
+
+import (
+	"log/slog"
+	"net/http"
+	"time"
+)
+
+type (
+	// struct for holding response details
+	responseData struct {
+		status int
+		size   int
+	}
+
+	// our http.ResponseWriter implementation
+	loggingResponseWriter struct {
+		http.ResponseWriter // compose original http.ResponseWriter
+		responseData        *responseData
+	}
+)
+
+func (r *loggingResponseWriter) Write(b []byte) (int, error) {
+	size, err := r.ResponseWriter.Write(b) // write response using original http.ResponseWriter
+	r.responseData.size += size            // capture size
+	return size, err
+}
+
+func (r *loggingResponseWriter) WriteHeader(statusCode int) {
+	r.ResponseWriter.WriteHeader(statusCode) // write status code using original http.ResponseWriter
+	r.responseData.status = statusCode       // capture status code
+}
+
+func WithLogging(h http.Handler) http.Handler {
+	loggingFn := func(rw http.ResponseWriter, req *http.Request) {
+		start := time.Now()
+
+		responseData := &responseData{
+			status: 0,
+			size:   0,
+		}
+		lrw := loggingResponseWriter{
+			ResponseWriter: rw, // compose original http.ResponseWriter
+			responseData:   responseData,
+		}
+		h.ServeHTTP(&lrw, req) // inject our implementation of http.ResponseWriter
+
+		duration := time.Since(start)
+
+		slog.Info("request completed",
+			"uri", req.RequestURI,
+			"method", req.Method,
+			"status", responseData.status, // get captured status code
+			"duration", duration,
+			"size", responseData.size, // get captured size
+		)
+	}
+	return http.HandlerFunc(loggingFn)
+}

cmd/serve-repo/main.go

@@ -0,0 +1,31 @@
+// Simple implementation of a HTTP server to be used by the updater with the http source
+package main
+
+import (
+	"flag"
+	"log"
+	"net/http"
+	"path"
+	"time"
+)
+
+func main() {
+	var root, listen, prefix, fixedSlug string
+	flag.StringVar(&root, "repo", "", "Root path of the file server")
+	flag.StringVar(&listen, "listen", "localhost:9947", "IP address and port used for the HTTP server")
+	flag.StringVar(&prefix, "path-prefix", "/repo", "Prefix to the root path of the HTTP server")
+	flag.StringVar(&fixedSlug, "fixed-slug", "creativeprojects/resticprofile", "Only answer on this particular slug. When NOT specified the files will be served with the slug in the path.")
+	flag.Parse()
+
+	mux := http.NewServeMux()
+	fs := http.FileServer(http.Dir(root))
+	pathPrefix := path.Join("/", prefix, fixedSlug)
+	log.Printf("listening on http://" + listen + pathPrefix)
+	mux.Handle(pathPrefix+"/", http.StripPrefix(pathPrefix, WithLogging(fs)))
+	server := http.Server{
+		Addr:              listen,
+		Handler:           mux,
+		ReadHeaderTimeout: 15 * time.Second,
+	}
+	server.ListenAndServe()
+}

cmd/source.go

@@ -75,6 +75,9 @@ func getSourceFromName(name, domain string) (selfupdate.Source, error) {
 	case "gitlab":
 		return selfupdate.NewGitLabSource(selfupdate.GitLabConfig{BaseURL: domain})
 
+	case "http":
+		return selfupdate.NewHttpSource(selfupdate.HttpConfig{BaseURL: domain})
+
 	default:
 		return newGitHubSource(domain)
 	}