maint: update todo

Makefile

@@ -5,7 +5,7 @@ GO?= go
 all: build
 
 build:
-	$(GO) build -o lash ./cmd/lash/
+	$(GO) build -o lash ./bin/main.go
 
 lint:
 	$(GO) fmt ./...

TODO

@@ -1,7 +1 @@
-maint: clean up source code
+feat: sumbit code with press of enter key
-maint: document more
-maint: make the colors more cross platform
-feat: improve flags
-feat: replace uuid dep with custom id generator
-feat: multiple files
-feat: use zeroconf for mDNS

bin/main.go

@@ -14,6 +14,7 @@ import (
 var versionFlag = flag.Bool("version", false, "Print out version and exit.")
 
 var port = flag.Int("p", 1337, "Set the port for LASH exchanges.")
+var numberOfShares = flag.Int("n", -1, "Number of shares to allow before killing the server.")
 
 func main() {
 	flag.Parse()
@@ -23,14 +24,21 @@ func main() {
 		return
 	}
 
-	srv := app.New()
+	ctx := lash.LashContext{
+		N: *numberOfShares,
+	}
+
+	srv := app.New(&ctx)
+
+	server := http.Server{
+		Addr:    fmt.Sprintf(":%d", *port),
+		Handler: srv,
+	}
 
-	// TODO(vxc): Make this more portable
 	errx.Log("Your share link is %s", share.GenerateShareLink(*port))
 	errx.Log("Your token is \033[1;92m%s\033[0m", lash.Token)
-
 	errx.Log("starting server at http://0.0.0.0:%d", *port)
-	if err := http.ListenAndServe(fmt.Sprintf(":%d", *port), srv); err != nil {
+	if err := server.ListenAndServe(); err != nil {
 		errx.FatalPerror(err)
 	}
 }

go.mod

@@ -2,4 +2,4 @@ module lash
 
 go 1.26.3
 
-require github.com/google/uuid v1.6.0 // indirect
+require github.com/google/uuid v1.6.0

internal/app/file.go

@@ -1,19 +0,0 @@
-package app
-
-import (
-	"errors"
-	"flag"
-	"strings"
-)
-
-func GetFilePath() (string, error) {
-	fp := ""
-
-	for _, v := range flag.Args() {
-		if !strings.HasPrefix(v, "-") {
-			fp = v
-			return fp, nil
-		}
-	}
-	return "", errors.New("not enough arguments")
-}

internal/app/routes.go

@@ -1,6 +1,7 @@
 package app
 
 import (
+	"flag"
 	"lash"
 	"lash/internal/errx"
 	"lash/internal/handlers"
@@ -8,26 +9,32 @@ import (
 	"os"
 )
 
-func New() http.Handler {
+func New(ctx *lash.LashContext) http.Handler {
 	mux := http.NewServeMux()
 
-	fp, err := GetFilePath()
-	if err != nil {
-		errx.FatalPerror(err)
-	}
-
-	contents, err := os.ReadFile(fp)
-	if err != nil {
-		errx.FatalPerror(err)
-	}
-
 	share := handlers.ShareData{
 		Version: lash.Version,
 	}
 
-	file := handlers.FileData{
+	file := handlers.FileHandler{
-		Contents: contents,
+		Ctx: ctx,
-		FileName: fp,
+	}
+
+	fps := flag.Args()
+	if len(fps) < 1 {
+		errx.FatalPerror(errx.ErrNotEnoughArgs)
+	}
+
+	for _, fp := range fps {
+		contents, err := os.ReadFile(fp)
+		if err != nil {
+			errx.FatalPerror(err)
+		}
+
+		file.FileData = append(file.FileData, handlers.FileData{
+			Contents: contents,
+			FileName: fp,
+		})
 	}
 
 	mux.HandleFunc("/", share.Handler)

internal/errx/define.go

@@ -0,0 +1,5 @@
+package errx
+
+import "errors"
+
+var ErrNotEnoughArgs error = errors.New("not enough arguments")

internal/generator/generator.go

@@ -0,0 +1,55 @@
+package generator
+
+import (
+	"math/rand/v2"
+)
+
+var keys []string = []string{
+	"octo",
+	"cool",
+	"whip",
+	"keys",
+	"cats",
+	"part",
+	"rate",
+	"face",
+	"lard",
+	"larp",
+	"dogs",
+	"cash",
+	"city",
+	"cold",
+	"desk",
+	"down",
+	"dirt",
+	"long",
+	"mean",
+	"news",
+	"only",
+	"open",
+	"year",
+	"wood",
+	"wing",
+	"work",
+	"wash",
+	"vote",
+	"onyx",
+	"snow",
+	"john",
+	"json",
+	"fang",
+}
+
+func Generate(n int) (code string) {
+	codeLen := n
+
+	start := rand.IntN(len(keys))
+
+	for i := range codeLen {
+		code += keys[(start+i)%len(keys)]
+		if i != codeLen-1 {
+			code += "-"
+		}
+	}
+	return
+}

internal/handlers/file.go

@@ -1,13 +1,20 @@
 package handlers
 
 import (
+	"archive/zip"
 	"encoding/json"
 	"fmt"
 	"lash"
+	"lash/internal/errx"
 	"net/http"
 	"strconv"
 )
 
+type FileHandler struct {
+	Ctx      *lash.LashContext
+	FileData []FileData
+}
+
 type FileData struct {
 	Contents []byte
 	FileName string
@@ -17,7 +24,9 @@ type ValidateRequest struct {
 	Token string
 }
 
-func (h FileData) APIHandler(w http.ResponseWriter, r *http.Request) {
+var sent int = 0
+
+func (h FileHandler) APIHandler(w http.ResponseWriter, r *http.Request) {
 	decoder := json.NewDecoder(r.Body)
 
 	var t ValidateRequest
@@ -32,21 +41,43 @@ func (h FileData) APIHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// Send the file over as a stream of bytes
+	http.Redirect(w, r, fmt.Sprintf("/%s", lash.ShareLinkToken), http.StatusTemporaryRedirect)
-	w.Header().Set("Content-Disposition", fmt.Sprintf("attachment; filename=%s", h.FileName))
-	w.Header().Set("Content-Type", "application/octet-stream")
-	w.Header().Set("Content-Length", strconv.Itoa(len(h.Contents)))
-
-	w.WriteHeader(http.StatusOK)
-	w.Write(h.Contents)
 }
 
-func (h FileData) FileHandler(w http.ResponseWriter, r *http.Request) {
+func (h FileHandler) FileHandler(w http.ResponseWriter, r *http.Request) {
-	// Send the file over as a stream of bytes
+	if sent >= h.Ctx.N && h.Ctx.N != -1 {
-	w.Header().Set("Content-Disposition", fmt.Sprintf("attachment; filename=%s", h.FileName))
+		http.Error(w, "Too many requests", http.StatusTooManyRequests)
-	w.Header().Set("Content-Type", "application/octet-stream")
+		return
-	w.Header().Set("Content-Length", strconv.Itoa(len(h.Contents)))
+	}
 
-	w.WriteHeader(http.StatusOK)
+	filename := h.FileData[0].FileName
-	w.Write(h.Contents)
+	if len(h.FileData) > 1 {
+		filename = "lash.zip"
+	}
+
+	w.Header().Set("Content-Disposition", fmt.Sprintf(`attachment; filename="%s"`, filename))
+	w.Header().Set("Content-Type", "application/octet-stream")
+
+	if len(h.FileData) == 1 {
+		w.Header().Set("Content-Length", strconv.Itoa(len(h.FileData[0].Contents)))
+		w.WriteHeader(http.StatusOK)
+		_, _ = w.Write(h.FileData[0].Contents)
+	} else {
+		w.WriteHeader(http.StatusOK)
+		zw := zip.NewWriter(w)
+		defer zw.Close()
+
+		for _, f := range h.FileData {
+			fw, err := zw.Create(f.FileName)
+			if err != nil {
+				errx.FatalPerror(err)
+			}
+			_, err = fw.Write(f.Contents)
+			if err != nil {
+				errx.FatalPerror(err)
+			}
+		}
+	}
+
+	sent++
 }

internal/handlers/share.go

@@ -13,7 +13,6 @@ type ShareData struct {
 }
 
 func (h *ShareData) Handler(w http.ResponseWriter, r *http.Request) {
-	// Although `Must` can fail since `Templates` is embeded these files will always exist.
 	tmpl := template.Must(template.ParseFS(lash.Templates, "templates/share.html"))
 
 	if err := tmpl.ExecuteTemplate(w, "share.html", h); err != nil {

internal/shareLink/shareLink.go

@@ -9,21 +9,21 @@ import (
 
 func GenerateShareLink(port int) string {
 	link := "http://"
-	link += getLocalIP()
+	link += GetLocalIP()
 	link += fmt.Sprintf(":%d", port)
 	link += "/"
 	link += lash.ShareLinkToken
 	return link
 }
 
-func getLocalIP() string {
+func GetLocalIP() string {
-    conn, err := net.Dial("udp", "8.8.8.8:80")
+	conn, err := net.Dial("udp", "8.8.8.8:80")
-    if err != nil {
+	if err != nil {
-	    errx.FatalPerror(err)
+		errx.FatalPerror(err)
-    }
+	}
-    defer conn.Close()
+	defer conn.Close()
 
-    localAddress := conn.LocalAddr().(*net.UDPAddr)
+	localAddress := conn.LocalAddr().(*net.UDPAddr)
 
-    return localAddress.IP.String()
+	return localAddress.IP.String()
 }

lash.go

@@ -2,17 +2,21 @@ package lash
 
 import (
 	"embed"
-
+	"lash/internal/generator"
-	"github.com/google/uuid"
+	"net/http"
 )
 
+type LashContext struct {
+	N      int
+	Server *http.Server
+}
+
 //go:embed templates/*.html
 var Templates embed.FS
 
 //go:embed version
 var Version string
 
-// TODO(vxc): Replace this with custom token generator
+var Token string = generator.Generate(1)
-var Token string = uuid.New().String()
 
-var ShareLinkToken string = uuid.New().String()
+var ShareLinkToken string = generator.Generate(1)

version

@@ -1 +1 @@
-1.0.0
+6