Implemented website UI

.dockerignore

@@ -2,5 +2,11 @@
 **/.gitignore
 **/.dockerignore
 **/.editorconfig
+**/node_modules
+
+core/build
+server/main
+website/.parcel-cache
+website/dist
 
 Dockerfile

.gitignore

@@ -0,0 +1,7 @@
+**/.vscode
+**/node_modules
+
+core/build
+server/main
+website/.parcel-cache
+website/dist

Dockerfile

@@ -1,24 +1,28 @@
 FROM archlinux:base-devel
 
-RUN pacman -Syu --noconfirm go meson libvips
+RUN pacman -Syu --noconfirm nodejs-lts-gallium npm go meson libvips
 
 COPY ./core /app/build/core
 COPY ./server /app/build/server
+COPY ./website /app/build/website
 
 WORKDIR /app/build/core
 RUN meson build && cd build && meson compile
 
 WORKDIR /app/build/server
 RUN go build -o gifspin-server main.go
 
+WORKDIR /app/build/website
+RUN npm ci && npm run build
 
 FROM archlinux:base
 
 RUN pacman -Syu --noconfirm libvips
 
 COPY --from=0 /app/build/core/build/gifspin-core /app/bin/gifspin-core
 COPY --from=0 /app/build/server/gifspin-server /app/bin/gifspin-server
+COPY --from=0 /app/build/website/dist /app/public
 
-RUN mkdir -p /app/public /data
+RUN mkdir -p /data
 
 CMD ["/app/bin/gifspin-server"]

server/main.go

@@ -251,7 +251,7 @@ func nanoid() string {
 	return nanoidEncode.EncodeToString(b)
 }
 
-var replaceUnsafePattern = regexp.MustCompile("[a-zA-Z0-9.~_-]")
+var replaceUnsafePattern = regexp.MustCompile("[^a-zA-Z0-9.~_-]")
 
 func replaceUnsafe(s string) string {
 	return replaceUnsafePattern.ReplaceAllString(s, "_")
@@ -311,7 +311,7 @@ func sendError(res http.ResponseWriter, err error) {
 }
 
 func sendErrorMessage(res http.ResponseWriter, status int, message string) {
-	res.Header().Set("X-Error", message)
+	res.Header().Set("X-Spin-Error", message)
 	sendJSON(res, status, map[string]string{"err": message})
 }
 
@@ -352,6 +352,8 @@ func handleUpload(res http.ResponseWriter, req *http.Request) {
 
 	token := generateTokenInput(extension)
 
+	res.Header().Set("X-Spin-Token", token)
+
 	var err error
 
 	tempPath := getPathFromToken(settings.PathTemp, token)
@@ -382,12 +384,24 @@ func handleSpin(res http.ResponseWriter, req *http.Request) {
 	}
 	tokenOutput = generateTokenOutput(tokenInput)
 
-	ctx := req.Context()
+	pathInput := getPathFromToken(settings.PathTemp, tokenInput)
+	pathOutput := getPathFromToken(settings.PathTemp, tokenOutput)
 
-	body := newContextReader(http.MaxBytesReader(res, req.Body, 65536), ctx)
+	res.Header().Set("X-Spin-Token", tokenInput)
+	res.Header().Set("X-Spin-TokenOutput", tokenOutput)
 
 	var err error
 
+	_, err = os.Stat(pathInput)
+	if errors.Is(err, os.ErrNotExist) {
+		sendErrorMessage(res, http.StatusNotFound, "query parameter \"file\" not found")
+		return
+	}
+
+	ctx := req.Context()
+
+	body := newContextReader(http.MaxBytesReader(res, req.Body, 65536), ctx)
+
 	var opts *CompositeOptions
 	var task *CompositeTask
 
@@ -405,8 +419,8 @@ func handleSpin(res http.ResponseWriter, req *http.Request) {
 
 	task = new(CompositeTask)
 	task.Options = opts
-	task.PathInput = getPathFromToken(settings.PathTemp, tokenInput)
-	task.PathOutput = getPathFromToken(settings.PathTemp, tokenOutput)
+	task.PathInput = pathInput
+	task.PathOutput = pathOutput
 	task.PathBinary = settings.PathBinary
 
 	err = dispatch.Execute(ctx, task)

website/.editorconfig

@@ -0,0 +1,15 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+
+indent_size = 4
+indent_style = space
+
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.html]
+indent_size = 2
+indent_style = space