Update import path

.goreleaser.yaml

@@ -29,7 +29,7 @@ blobs:
     folder: "/"
 release:
   gitea:
-    owner: Elara6331
+    owner: lure
     name: lure-updater
 gitea_urls:
   api: 'https://gitea.elara.ws/api/v1/'

.woodpecker.yml

@@ -1,3 +1,4 @@
+platform: linux/amd64
 pipeline:
   release:
     image: goreleaser/goreleaser

README.md

@@ -1,12 +1,12 @@
 # LURE Updater
 
-Modular bot that automatically checks for upstream updates and pushes new packages to [lure-repo](https://github.com/Elara6331/lure-repo).
+Modular bot that automatically checks for upstream updates and pushes new packages to [lure-repo](https://github.com/lure-sh/lure-repo).
 
 ---
 
 ### How it works
 
-Since LURE is meant to be able to install many different types of packages, this bot accepts [plugins](https://gitea.elara.ws/Elara6331/updater-plugins) in the form of [Starlark](https://github.com/bazelbuild/starlark) files rather than hardcoding each package. These plugins can schedule functions to be run at certain intervals, or when a webhook is received, and they have access to persistent key/value storage to keep track of information. This allows plugins to use many different ways to detect upstream updates.
+Since LURE is meant to be able to install many different types of packages, this bot accepts [plugins](https://gitea.elara.ws/lure/updater-plugins) in the form of [Starlark](https://github.com/bazelbuild/starlark) files rather than hardcoding each package. These plugins can schedule functions to be run at certain intervals, or when a webhook is received, and they have access to persistent key/value storage to keep track of information. This allows plugins to use many different ways to detect upstream updates.
 
 For example, the plugin for `discord-bin` repeatedly polls discord's API every hour for the current latest download link. It puts the link in persistent storage, and if it has changed since last time, it parses the URL to extract the version number, and uses that to update the build script for `discord-bin`.
 

go.mod

@@ -1,4 +1,4 @@
-module go.elara.ws/lure-updater
+module lure.sh/lure-updater
 
 go 1.20
 

internal/builtins/html.go

@@ -1,9 +1,6 @@
 package builtins
 
 import (
-	"io"
-	"strings"
-
 	"github.com/PuerkitoBio/goquery"
 	"go.starlark.net/starlark"
 	"go.starlark.net/starlarkstruct"
@@ -24,21 +21,11 @@ var htmlModule = &starlarkstruct.Module{
 }
 
 func htmlParse(thread *starlark.Thread, fn *starlark.Builtin, args starlark.Tuple, kwargs []starlark.Tuple) (starlark.Value, error) {
-	var val starlark.Value
+	var r readerValue
-	err := starlark.UnpackArgs("html.selection.find", args, kwargs, "from", &val)
+	err := starlark.UnpackArgs("html.selection.find", args, kwargs, "from", &r)
 	if err != nil {
 		return nil, err
 	}
-
-	var r io.ReadCloser
-	switch val := val.(type) {
-	case starlark.String:
-		r = io.NopCloser(strings.NewReader(string(val)))
-	case starlark.Bytes:
-		r = io.NopCloser(strings.NewReader(string(val)))
-	case starlarkReader:
-		r = val
-	}
 	defer r.Close()
 
 	doc, err := goquery.NewDocumentFromReader(r)

internal/builtins/http.go

@@ -27,7 +27,7 @@ import (
 	"strings"
 
 	"go.elara.ws/logger/log"
-	"go.elara.ws/lure-updater/internal/config"
+	"lure.sh/lure-updater/internal/config"
 	"go.starlark.net/starlark"
 	"go.starlark.net/starlarkstruct"
 	"golang.org/x/crypto/bcrypt"
@@ -80,6 +80,8 @@ func (sbr *starlarkBodyReader) Unpack(v starlark.Value) error {
 		sbr.Reader = strings.NewReader(string(v))
 	case starlark.Bytes:
 		sbr.Reader = strings.NewReader(string(v))
+	case starlarkReader:
+		sbr.Reader = v
 	default:
 		return fmt.Errorf("%w: %s", ErrInvalidBodyType, v.Type())
 	}
@@ -221,7 +223,7 @@ func registerWebhook(mux *http.ServeMux, cfg *config.Config, pluginName string)
 }
 
 func webhookHandler(pluginName string, secure bool, cfg *config.Config, thread *starlark.Thread, fn *starlark.Function) http.HandlerFunc {
-	return func(res http.ResponseWriter, req *http.Request) {
+	return handleError(func(res http.ResponseWriter, req *http.Request) *HTTPError {
 		defer req.Body.Close()
 
 		res.Header().Add("X-Updater-Plugin", pluginName)
@@ -229,20 +231,22 @@ func webhookHandler(pluginName string, secure bool, cfg *config.Config, thread *
 		if secure {
 			err := verifySecure(cfg.Webhook.PasswordHash, pluginName, req)
 			if err != nil {
-				log.Error("Error verifying webhook").Err(err).Send()
+				return &HTTPError{
-				res.WriteHeader(http.StatusForbidden)
+					Message: "Error verifying webhook",
-				_, _ = io.WriteString(res, err.Error())
+					Code:    http.StatusForbidden,
-				return
+					Err:     err,
+				}
 			}
 		}
 
 		log.Debug("Calling webhook function").Str("name", fn.Name()).Stringer("pos", fn.Position()).Send()
 		val, err := starlark.Call(thread, fn, starlark.Tuple{starlarkRequest(req)}, nil)
 		if err != nil {
-			log.Error("Error while executing webhook").Err(err).Stringer("pos", fn.Position()).Send()
+			return &HTTPError{
-			res.WriteHeader(http.StatusInternalServerError)
+				Message: "Error while executing webhook",
-			_, _ = io.WriteString(res, err.Error())
+				Code:    http.StatusInternalServerError,
-			return
+				Err:     err,
+			}
 		}
 
 		switch val := val.(type) {
@@ -260,13 +264,20 @@ func webhookHandler(pluginName string, secure bool, cfg *config.Config, thread *
 			body := newBodyReader()
 			err = body.Unpack(val)
 			if err != nil {
-				log.Error("Error unpacking returned body").Err(err).Send()
+				return &HTTPError{
-				return
+					Message: "Error unpacking returned body",
+					Code:    http.StatusInternalServerError,
+					Err:     err,
+				}
 			}
 			_, err = io.Copy(res, body)
 			if err != nil {
 				log.Error("Error writing body").Err(err).Send()
-				return
+				return &HTTPError{
+					Message: "Error writing body",
+					Code:    http.StatusInternalServerError,
+					Err:     err,
+				}
 			}
 		case *starlark.Dict:
 			code := http.StatusOK
@@ -274,8 +285,11 @@ func webhookHandler(pluginName string, secure bool, cfg *config.Config, thread *
 			if ok {
 				err = starlark.AsInt(codeVal, &code)
 				if err != nil {
-					log.Error("Error decoding returned status code").Err(err).Send()
+					return &HTTPError{
-					return
+						Message: "Error decoding returned status code",
+						Code:    http.StatusInternalServerError,
+						Err:     err,
+					}
 				}
 				res.WriteHeader(code)
 			}
@@ -285,16 +299,40 @@ func webhookHandler(pluginName string, secure bool, cfg *config.Config, thread *
 			if ok {
 				err = body.Unpack(bodyVal)
 				if err != nil {
-					log.Error("Error unpacking returned body").Err(err).Send()
+					return &HTTPError{
-					return
+						Message: "Error unpacking returned body",
+						Code:    http.StatusInternalServerError,
+						Err:     err,
+					}
 				}
 				_, err = io.Copy(res, body)
 				if err != nil {
-					log.Error("Error writing body").Err(err).Send()
+					return &HTTPError{
-					return
+						Message: "Error writing body",
+						Code:    http.StatusInternalServerError,
+						Err:     err,
+					}
 				}
 			}
 		}
+		return nil
+	})
+}
+
+type HTTPError struct {
+	Code    int
+	Message string
+	Err     error
+}
+
+func handleError(h func(res http.ResponseWriter, req *http.Request) *HTTPError) http.HandlerFunc {
+	return func(res http.ResponseWriter, req *http.Request) {
+		httpErr := h(res, req)
+		if httpErr != nil {
+			log.Error(httpErr.Message).Err(httpErr.Err).Send()
+			res.WriteHeader(httpErr.Code)
+			fmt.Sprintf("%s: %s", httpErr.Message, httpErr.Err)
+		}
 	}
 }
 

internal/builtins/reader.go

@@ -3,10 +3,12 @@ package builtins
 import (
 	"bufio"
 	"encoding/json"
+	"errors"
 	"io"
+	"strings"
 
 	"github.com/vmihailenco/msgpack/v5"
-	"go.elara.ws/lure-updater/internal/convert"
+	"lure.sh/lure-updater/internal/convert"
 	"go.starlark.net/starlark"
 	"go.starlark.net/starlarkstruct"
 )
@@ -213,3 +215,24 @@ func (sr starlarkReader) Close() error {
 	}
 	return nil
 }
+
+type readerValue struct {
+	io.ReadCloser
+}
+
+func (rv *readerValue) Unpack(v starlark.Value) error {
+	switch val := v.(type) {
+	case starlark.String:
+		rv.ReadCloser = io.NopCloser(strings.NewReader(string(val)))
+	case starlark.Bytes:
+		rv.ReadCloser = io.NopCloser(strings.NewReader(string(val)))
+	case starlarkReader:
+		rv.ReadCloser = val
+	}
+
+	if rv.ReadCloser == nil {
+		return errors.New("invalid type for reader")
+	}
+
+	return nil
+}

internal/builtins/register.go

@@ -21,7 +21,7 @@ package builtins
 import (
 	"net/http"
 
-	"go.elara.ws/lure-updater/internal/config"
+	"lure.sh/lure-updater/internal/config"
 	"go.etcd.io/bbolt"
 	"go.starlark.net/starlark"
 	"go.starlark.net/starlarkjson"

internal/builtins/updater.go

@@ -30,7 +30,7 @@ import (
 	"github.com/go-git/go-git/v5/plumbing/object"
 	"github.com/go-git/go-git/v5/plumbing/transport/http"
 	"go.elara.ws/logger/log"
-	"go.elara.ws/lure-updater/internal/config"
+	"lure.sh/lure-updater/internal/config"
 	"go.starlark.net/starlark"
 	"go.starlark.net/starlarkstruct"
 )

lure-updater.example.toml

@@ -1,5 +1,5 @@
 [git]
-  repoURL = "https://github.com/Elara6331/lure-repo.git"
+  repoURL = "https://github.com/lure-sh/lure-repo.git"
   repoDir = "/etc/lure-updater/repo"
   [git.commit]
     # The name and email to use in the git commit

main.go

@@ -31,8 +31,8 @@ import (
 	"github.com/spf13/pflag"
 	"go.elara.ws/logger"
 	"go.elara.ws/logger/log"
-	"go.elara.ws/lure-updater/internal/builtins"
+	"lure.sh/lure-updater/internal/builtins"
-	"go.elara.ws/lure-updater/internal/config"
+	"lure.sh/lure-updater/internal/config"
 	"go.etcd.io/bbolt"
 	"go.starlark.net/starlark"
 	"golang.org/x/crypto/bcrypt"

template.nomad

@@ -27,7 +27,7 @@ job "lure-updater" {
 
       env {
         GIT_REPO_DIR             = "/etc/lure-updater/repo"
-        GIT_REPO_URL             = "https://github.com/Elara6331/lure-repo.git"
+        GIT_REPO_URL             = "https://github.com/lure-sh/lure-repo.git"
         GIT_CREDENTIALS_USERNAME = "lure-repo-bot"
         GIT_CREDENTIALS_PASSWORD = "${GITHUB_PASSWORD}"
         GIT_COMMIT_NAME          = "lure-repo-bot"
@@ -58,7 +58,7 @@ job "lure-updater" {
 
         tags = [
           "traefik.enable=true",
-          "traefik.http.routers.lure-updater.rule=Host(`updater.lure.elara.ws`)",
+          "traefik.http.routers.lure-updater.rule=Host(`updater.lure.sh`)",
           "traefik.http.routers.lure-updater.tls.certResolver=letsencrypt",
         ]
       }