init: 0.0.8

feat: 实现了分片上传
todo:
  1. 上传完成后 code 回显
  2. 清理不用的临时 code file
  3. 断点续传
  4. 多 chunk 并发上传

internal/api/api.go

@@ -18,7 +18,9 @@ func Start(ctx context.Context) <-chan struct{} {
 		return c.SendStatus(http.StatusOK)
 	})
 
-	app.Get("/api/share/fetch", handler.Fetch())
+	app.Get("/api/share/:code", handler.Fetch())
+	app.Put("/api/share/:filename", handler.ShareNew()) // 获取上传 code, 分片大小
+	app.Post("/api/share/:code", handler.ShareUpload()) // 分片上传接口
 
 	ready := make(chan struct{})
 	ln, err := net.Listen("tcp", opt.Cfg.Address)

internal/controller/meta.go

@@ -0,0 +1,122 @@
+package controller
+
+import (
+	"context"
+	"fmt"
+	"github.com/loveuer/nf/nft/log"
+	"github.com/loveuer/ushare/internal/opt"
+	gonanoid "github.com/matoous/go-nanoid/v2"
+	"io"
+	"os"
+	"sync"
+	"time"
+)
+
+type metaInfo struct {
+	f      *os.File
+	name   string
+	create time.Time
+	last   time.Time
+	size   int64
+	cursor int64
+	ip     string
+}
+
+func (m *metaInfo) generateMeta(code string) error {
+	content := fmt.Sprintf("filename=%s\ncreated_at=%d\nsize=%d\nuploader_ip=%s",
+		m.name, m.create.UnixMilli(), m.size, m.ip,
+	)
+
+	return os.WriteFile(opt.MetaPath(code), []byte(content), 0644)
+}
+
+type meta struct {
+	sync.Mutex
+	ctx context.Context
+	m   map[string]*metaInfo
+}
+
+var (
+	MetaManager = &meta{m: make(map[string]*metaInfo)}
+)
+
+const letters = "1234567890abcdefghijklmnopqrstuvwxyz"
+
+func (m *meta) New(size int64, filename, ip string) (string, error) {
+	now := time.Now()
+	code, err := gonanoid.Generate(letters, 16)
+	if err != nil {
+		return "", err
+	}
+
+	f, err := os.Create(opt.FilePath(code))
+	if err != nil {
+		return "", err
+	}
+
+	if err = f.Truncate(size); err != nil {
+		f.Close()
+		return "", err
+	}
+
+	m.Lock()
+	defer m.Unlock()
+
+	m.m[code] = &metaInfo{f: f, name: filename, last: now, size: size, cursor: 0, create: now, ip: ip}
+
+	return code, nil
+}
+
+func (m *meta) Write(code string, start, end int64, reader io.Reader) (total, cursor int64, err error) {
+	m.Lock()
+	defer m.Unlock()
+
+	if _, ok := m.m[code]; !ok {
+		return 0, 0, fmt.Errorf("code not exist")
+	}
+
+	w, err := io.CopyN(m.m[code].f, reader, end-start+1)
+	if err != nil {
+		return 0, 0, err
+	}
+
+	m.m[code].cursor += w
+	m.m[code].last = time.Now()
+
+	total = m.m[code].size
+	cursor = m.m[code].cursor
+
+	if m.m[code].cursor == m.m[code].size {
+		defer delete(m.m, code)
+		if err = m.m[code].generateMeta(code); err != nil {
+			return 0, 0, err
+		}
+	}
+
+	return total, cursor, nil
+}
+
+func (m *meta) Start(ctx context.Context) {
+	ticker := time.NewTicker(time.Minute)
+	m.ctx = ctx
+
+	go func() {
+		for {
+			select {
+			case <-ctx.Done():
+				return
+			case now := <-ticker.C:
+				for code, info := range m.m {
+					if now.Sub(info.last) > 1*time.Minute {
+						m.Lock()
+						info.f.Close()
+						os.RemoveAll(opt.FilePath(code))
+						delete(m.m, code)
+						m.Unlock()
+						log.Warn("MetaController: code timeout removed, code = %s", code)
+					}
+				}
+			}
+		}
+	}()
+}

internal/handler/share.go

@@ -3,17 +3,23 @@ package handler
 import (
 	"fmt"
 	"github.com/loveuer/nf"
+	"github.com/loveuer/nf/nft/log"
+	"github.com/loveuer/ushare/internal/controller"
 	"github.com/loveuer/ushare/internal/model"
 	"github.com/loveuer/ushare/internal/opt"
 	"github.com/pkg/errors"
+	"github.com/spf13/cast"
 	"github.com/spf13/viper"
 	"net/http"
 	"os"
+	"regexp"
+	"strings"
 )
 
 func Fetch() nf.HandlerFunc {
 	return func(c *nf.Ctx) error {
-		code := c.Query("code")
+		code := c.Param("code")
+		log.Debug("handler.Fetch: code = %s", code)
 		info := new(model.Meta)
 		_, err := os.Stat(opt.MetaPath(code))
 		if err != nil {
@@ -40,3 +46,74 @@ func Fetch() nf.HandlerFunc {
 		return nil
 	}
 }
+
+func ShareNew() nf.HandlerFunc {
+	return func(c *nf.Ctx) error {
+
+		filename := strings.TrimSpace(c.Param("filename"))
+		if filename == "" {
+			return c.Status(http.StatusBadRequest).JSON(map[string]string{"msg": "filename required"})
+		}
+
+		size, err := cast.ToInt64E(c.Get(opt.HeaderSize))
+		if err != nil {
+			return c.Status(http.StatusBadRequest).JSON(map[string]string{"msg": "miss header: " + opt.HeaderSize})
+		}
+
+		code, err := controller.MetaManager.New(size, filename, c.IP())
+		if err != nil {
+			return c.Status(http.StatusInternalServerError).JSON(map[string]string{"msg": ""})
+		}
+
+		return c.Status(http.StatusOK).JSON(map[string]string{"code": code})
+	}
+}
+
+func ShareUpload() nf.HandlerFunc {
+	rangeValidator := regexp.MustCompile(`^bytes=\d+-\d+$`)
+	return func(c *nf.Ctx) error {
+		code := strings.TrimSpace(c.Param("code"))
+		if len(code) != 16 {
+			return c.Status(http.StatusBadRequest).JSON(map[string]string{"msg": "invalid file code"})
+		}
+
+		log.Debug("handler.ShareUpload: code = %s", code)
+
+		ranger := strings.TrimSpace(c.Get("Range"))
+		if ranger == "" {
+			return c.Status(http.StatusBadRequest).JSON(map[string]string{"msg": "miss header: Range"})
+		}
+
+		log.Debug("handler.ShareUpload: code = %s, ranger = %s", code, ranger)
+
+		if !rangeValidator.MatchString(ranger) {
+			log.Warn("handler.ShareUpload: invalid range, ranger = %s", ranger)
+			return c.Status(http.StatusBadRequest).JSON(map[string]string{"msg": "Range invalid(1)"})
+		}
+
+		strs := strings.Split(strings.TrimPrefix(ranger, "bytes="), "-")
+		if len(strs) != 2 {
+			return c.Status(http.StatusBadRequest).JSON(map[string]string{"msg": "Range invalid(2)"})
+		}
+
+		start, err := cast.ToInt64E(strs[0])
+		if err != nil {
+			return c.Status(http.StatusBadRequest).JSON(map[string]string{"msg": "Range invalid(3)"})
+		}
+
+		end, err := cast.ToInt64E(strs[1])
+		if err != nil {
+			return c.Status(http.StatusBadRequest).JSON(map[string]string{"msg": "Range invalid(4)"})
+		}
+
+		log.Debug("handler.ShareUpload: code = %s, start = %d, end = %d", code, start, end)
+
+		total, cursor, err := controller.MetaManager.Write(code, start, end, c.Request.Body)
+		if err != nil {
+			log.Error("handler.ShareUpload: write error: %s", err)
+			return c.Status(http.StatusInternalServerError).JSON(map[string]string{"msg": ""})
+		}
+
+		return c.Status(http.StatusOK).JSON(map[string]any{"size": total, "cursor": cursor})
+	}
+}

internal/opt/var.go

@@ -3,7 +3,8 @@ package opt
 import "path/filepath"
 
 const (
-	Meta = ".meta."
+	Meta       = ".meta."
+	HeaderSize = "X-File-Size"
 )
 
 func FilePath(code string) string {