feat(volumes): add volumes serve

Author: duanhongyi

go.mod

@@ -5,7 +5,7 @@ go 1.25
 require (
 	github.com/chai2010/gettext-go v1.0.3
 	github.com/containerd/console v1.0.4
-	github.com/drycc/controller-sdk-go v0.0.0-20250930075415-578495a55414
+	github.com/drycc/controller-sdk-go v0.0.0-20251203071902-cc535b118251
 	github.com/drycc/pkg v0.0.0-20250917064731-345368da3dbf
 	github.com/minio/selfupdate v0.6.0
 	github.com/olekukonko/tablewriter v0.0.5

go.sum

@@ -11,8 +11,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6N
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/drycc/controller-sdk-go v0.0.0-20250930075415-578495a55414 h1:wiVKgwQsSEBbrQj92Lor6YknaAwPUVp1s/VmAmS3/lI=
-github.com/drycc/controller-sdk-go v0.0.0-20250930075415-578495a55414/go.mod h1:eHcmYwg81ASlP55/U587xnBZnZoeZnPHXGeQ8nYWnsg=
+github.com/drycc/controller-sdk-go v0.0.0-20251203071902-cc535b118251 h1:6bhcFnQn478sys8IXaeZW4OnurK64gTNMsu2NqKoCIw=
+github.com/drycc/controller-sdk-go v0.0.0-20251203071902-cc535b118251/go.mod h1:eHcmYwg81ASlP55/U587xnBZnZoeZnPHXGeQ8nYWnsg=
 github.com/drycc/pkg v0.0.0-20250917064731-345368da3dbf h1:CYy3NoPhfFhkGAbEppTOQfY/HC2s0FJDcBgbtRKeweg=
 github.com/drycc/pkg v0.0.0-20250917064731-345368da3dbf/go.mod h1:BrrNrNskHKm+nJYhXfGuI114w8nupi0AMo8QZHID7CM=
 github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=

internal/commands/volumes.go

@@ -1,17 +1,16 @@
 package commands
 
 import (
+	"context"
 	"fmt"
-	"io"
-	"net/http"
 	"net/url"
 	"os"
-	"path"
+	"os/signal"
 	"regexp"
 	"strings"
+	"syscall"
 	"time"
 
-	drycc "github.com/drycc/controller-sdk-go"
 	"github.com/drycc/controller-sdk-go/api"
 	"github.com/drycc/controller-sdk-go/volumes"
 	"github.com/drycc/workflow-cli/internal/loader"
@@ -161,17 +160,41 @@ func (d *DryccCmd) VolumesDelete(appID, name string) error {
 	return nil
 }
 
-// VolumesClient a client for manage volume file
-func (d *DryccCmd) VolumesClient(appID, cmd string, args ...string) error {
-	switch cmd {
-	case "ls":
-		return d.volumesClientLs(appID, args[0])
-	case "cp":
-		return d.volumesClientCp(appID, args[0], args[1])
-	case "rm":
-		return d.volumesClientRm(appID, args[0])
-	default:
-		return fmt.Errorf("unknown command %s", cmd)
+// VolumesServe Serve serves an app's volume.
+func (d *DryccCmd) VolumesServe(appID, name string) error {
+	appID, s, err := loader.LoadAppSettings(d.ConfigFile, appID)
+	if err != nil {
+		return err
+	}
+	parent, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	quit := progress(d.WOut)
+	ctx, filer, err := volumes.Serve(parent, s.Client, appID, name)
+	quit <- true
+	<-quit
+	if err != nil {
+		return err
+	}
+
+	table := d.getDefaultFormatTable([]string{})
+	table.Append([]string{"Endpoint:", filer["endpoint"]})
+	table.Append([]string{"Username:", filer["username"]})
+	table.Append([]string{"Password:", filer["password"]})
+	table.Render()
+	d.Print("\n")
+
+	signalChan := make(chan os.Signal, 1)
+	signal.Notify(signalChan, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP, syscall.SIGUSR1, syscall.SIGUSR2)
+	d.Printf("WebDAV service for volume %s is running. Press Ctrl+C to stop.\n", name)
+	for {
+		select {
+		case <-signalChan:
+			return nil
+		case <-ctx.Done():
+			return nil
+		default:
+			time.Sleep(2 * time.Second)
+		}
 	}
 }
 
@@ -233,172 +256,6 @@ func (d *DryccCmd) VolumesUnmount(appID string, name string, volumeVars []string
 	return nil
 }
 
-// volumesClientLs get all directory entries sorted by filename.
-func (d *DryccCmd) volumesClientLs(appID, vol string) error {
-	appID, s, err := loader.LoadAppSettings(d.ConfigFile, appID)
-	if err != nil {
-		return err
-	}
-
-	name, path, err := parseVol(vol)
-	if err != nil {
-		return err
-	}
-	dirs, _, err := volumes.ListDir(s.Client, appID, name, path, 3000)
-	if err != nil {
-		return err
-	}
-
-	table := d.getDefaultFormatTable([]string{})
-	for _, dir := range dirs {
-		if dir.Type == "dir" {
-			dir.Name = fmt.Sprintf("%s/", dir.Name)
-		}
-		table.Append([]string{fmt.Sprintf("[%s]", d.formatTime(dir.Timestamp)), dir.Size, dir.Name})
-	}
-	table.Render()
-	return nil
-}
-
-func (d *DryccCmd) volumesClientGetAll(client *drycc.Client, appID, volumeID, volumePath, localPath string) error {
-	if _, err := os.Stat(localPath); err != nil && os.IsNotExist(err) {
-		os.MkdirAll(localPath, os.ModePerm)
-	}
-	dirs, _, err := volumes.ListDir(client, appID, volumeID, volumePath, 3000)
-	if err != nil {
-		return err
-	}
-	for _, dir := range dirs {
-		_, subpath := path.Split(dir.Path)
-		filepath := path.Join(localPath, subpath)
-		if dir.Type == "file" {
-			res, err := volumes.GetFile(client, appID, volumeID, dir.Path)
-			if err != nil {
-				return err
-			}
-			w, err := os.OpenFile(filepath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0o644)
-			if err != nil {
-				return err
-			}
-			bar := d.newProgressbar(res.ContentLength, "↓", filepath)
-			defer w.Close()
-			if _, err = io.Copy(io.MultiWriter(w, bar), res.Body); err != nil {
-				return err
-			}
-		} else {
-			os.MkdirAll(filepath, os.ModePerm)
-			if err := d.volumesClientGetAll(client, appID, volumeID, dir.Path, filepath); err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-func (d *DryccCmd) volumesClientPostAll(client *drycc.Client, appID, volumeID, volumePath, localPath string) error {
-	if file, err := os.Stat(localPath); err != nil {
-		return err
-	} else if !file.IsDir() {
-		file, err := os.Open(localPath)
-		if err != nil {
-			return err
-		}
-		defer file.Close()
-
-		stat, err := file.Stat()
-		if err != nil {
-			return err
-		}
-		if stat.Size() > 0 { // ignore empty file
-			reader := progressbar.NewReader(file, d.newProgressbar(stat.Size(), "↑", localPath))
-			if _, err := volumes.PostFile(client, appID, volumeID, volumePath, file.Name(), stat.Size(), &reader); err != nil {
-				return err
-			}
-		} else {
-			d.newProgressbar(1, "?", localPath).Finish()
-		}
-		return nil
-	}
-	if entries, err := os.ReadDir(localPath); err == nil {
-		for _, entry := range entries {
-			var dstFilepath string
-			if entry.IsDir() {
-				dstFilepath = path.Join(volumePath, entry.Name())
-			} else {
-				dstFilepath = volumePath
-			}
-			if err := d.volumesClientPostAll(client, appID, volumeID, dstFilepath, path.Join(localPath, entry.Name())); err != nil {
-				return err
-			}
-		}
-	} else {
-		return err
-	}
-	return nil
-}
-
-// volumesClientCp copy files between volume and local file
-func (d *DryccCmd) volumesClientCp(appID, src, dst string) error {
-	appID, s, err := loader.LoadAppSettings(d.ConfigFile, appID)
-	if err != nil {
-		return err
-	}
-	if strings.HasPrefix(src, "vol://") {
-		f, err := os.Stat(dst)
-		if err != nil {
-			return err
-		}
-		if !f.IsDir() {
-			return fmt.Errorf("the local path must be an existing dir")
-		}
-		volumeID, volumePath, err := parseVol(src)
-		if err != nil {
-			return err
-		}
-		if dirs, _, err := volumes.ListDir(s.Client, appID, volumeID, volumePath, 3000); err == nil && (len(dirs) != 1 || dirs[0].Type != "file") {
-			dst = mergeDestDir(dst, volumePath)
-		}
-		return d.volumesClientGetAll(s.Client, appID, volumeID, volumePath, dst)
-	} else if strings.HasPrefix(dst, "vol://") {
-		volumeID, volumePath, err := parseVol(dst)
-		if err != nil {
-			return err
-		}
-		if dirs, _, err := volumes.ListDir(s.Client, appID, volumeID, volumePath, 3000); err == nil {
-			names := strings.Split(strings.Trim(src, "/"), "/")
-			if len(dirs) == 1 && dirs[0].Type == "file" && strings.HasSuffix(strings.Trim(volumePath, "/"), names[len(names)-1]) {
-				return fmt.Errorf("the volume path cannot be an existing file")
-			}
-		}
-		if file, err := os.Stat(src); err == nil && file.IsDir() {
-			volumePath = mergeDestDir(volumePath, src)
-		}
-		return d.volumesClientPostAll(s.Client, appID, volumeID, volumePath, src)
-	}
-	return nil
-}
-
-// volumesClientRm delete a file from volume
-func (d *DryccCmd) volumesClientRm(appID, vol string) error {
-	appID, s, err := loader.LoadAppSettings(d.ConfigFile, appID)
-	if err != nil {
-		return err
-	}
-	host, path, err := parseVol(vol)
-	if err != nil {
-		return err
-	}
-	res, err := volumes.DeleteFile(s.Client, appID, host, path)
-	if err != nil {
-		return err
-	}
-	if res.StatusCode != http.StatusOK {
-		return fmt.Errorf("incorrect http status code %d", res.StatusCode)
-	}
-
-	return nil
-}
-
 func parseVolume(volumeVars []string) (map[string]any, error) {
 	volumeMap := make(map[string]any)
 	regex := regexp.MustCompile(`^([a-z0-9]+(?:-[a-z0-9]+)*)=(\/([\w]+[\w-]*\/?)+)$`)

internal/commands/volumes_test.go

@@ -4,8 +4,9 @@ import (
 	"bytes"
 	"fmt"
 	"net/http"
-	"os"
+	"syscall"
 	"testing"
+	"time"
 
 	"github.com/drycc/controller-sdk-go/api"
 	"github.com/drycc/workflow-cli/pkg/testutil"
@@ -134,7 +135,7 @@ Updated:       2020-08-26T00:00:00UTC
 `)
 }
 
-func TestVolumesClientLs(t *testing.T) {
+func TestVolumesServe(t *testing.T) {
 	t.Parallel()
 	cf, server, err := testutil.NewTestServerAndClient()
 	if err != nil {
@@ -143,68 +144,43 @@ func TestVolumesClientLs(t *testing.T) {
 	defer server.Close()
 	var b bytes.Buffer
 	cmdr := DryccCmd{WOut: &b, ConfigFile: cf}
-	server.Mux.HandleFunc("/v2/apps/example-go/volumes/myvolume/client/", func(w http.ResponseWriter, _ *http.Request) {
+	server.Mux.HandleFunc("/v2/apps/example-go/volumes/myvolume/filer/_/ping", func(w http.ResponseWriter, _ *http.Request) {
 		testutil.SetHeaders(w)
-		fmt.Fprintf(w, `{"results": [
-  {"name":"handler.go","size":"4159","timestamp":"2024-06-25T22:55:16+08:00","type":"file","path":"/handler.go"},
-  {"name":"handler_test.go","size":"2310","timestamp":"2024-06-04T15:29:45+08:00","type":"file","path":"/handler_test.go"}
-], "count": 2}`)
+		fmt.Fprintf(w, `pong`)
 	})
-
-	err = cmdr.VolumesClient("example-go", "ls", "vol://myvolume")
-	assert.NoError(t, err)
-	assert.Contains(t, b.String(), "handler_test.go")
-}
-
-func TestVolumesClientCp(t *testing.T) {
-	t.Parallel()
-	cf, server, err := testutil.NewTestServerAndClient()
-	if err != nil {
-		t.Fatal(err)
-	}
-	server.Mux.HandleFunc("/v2/apps/example-go/volumes/myvolume/client/", func(w http.ResponseWriter, r *http.Request) {
-		testutil.SetHeaders(w)
-		if r.URL.RawQuery == "path=etc" {
-			fmt.Fprintf(w, `{"results":[],"count":0}`)
-		} else if r.Method == http.MethodGet {
-			fmt.Fprintf(w, `{"results":[{"name":"hello.txt","size":"4159","timestamp":"2024-06-25T22:55:16+08:00","type":"file","path":"/hello.txt"}], "count": 1}`)
-		}
-	})
-	server.Mux.HandleFunc("/v2/apps/example-go/volumes/myvolume/client/hello.txt", func(w http.ResponseWriter, _ *http.Request) {
+	server.Mux.HandleFunc("/v2/apps/example-go/volumes/myvolume/filer/_/bind", func(w http.ResponseWriter, _ *http.Request) {
 		testutil.SetHeaders(w)
-		fmt.Fprintf(w, `hello word`)
+		fmt.Fprintf(w, `{"endpoint": "/v2/apps/example-go/volumes/myvolume/filer/webdav", "username": "user", "password": "pass"}`)
 	})
-	defer server.Close()
 
-	var b bytes.Buffer
-	cmdr := DryccCmd{WOut: &b, ConfigFile: cf}
-	// test download file
-	err = cmdr.VolumesClient("example-go", "cp", "vol://myvolume/hello.txt", "/tmp")
-	assert.NoError(t, err)
-	result, err := os.ReadFile("/tmp/hello.txt")
-	assert.NoError(t, err)
-	assert.Equal(t, string(result), `hello word`, "output")
-	// test upload file
-	err = cmdr.VolumesClient("example-go", "cp", "/tmp/hello.txt", "vol://myvolume/etc")
-	assert.NoError(t, err)
-}
-
-func TestVolumesClientRm(t *testing.T) {
-	t.Parallel()
-	cf, server, err := testutil.NewTestServerAndClient()
-	if err != nil {
-		t.Fatal(err)
+	// Use a channel to signal when the method has been called
+	done := make(chan error, 1)
+	go func() {
+		done <- cmdr.VolumesServe("example-go", "myvolume")
+	}()
+
+	// Give the goroutine time to start and produce output
+	time.Sleep(500 * time.Millisecond)
+
+	// Send interrupt signal to stop the blocking method
+	go func() {
+		time.Sleep(100 * time.Millisecond)
+		syscall.Kill(syscall.Getpid(), syscall.SIGINT)
+	}()
+
+	// Wait for completion with timeout
+	select {
+	case err := <-done:
+		assert.NoError(t, err)
+	case <-time.After(5 * time.Second):
+		t.Fatal("VolumesServe did not complete within timeout")
 	}
-	defer server.Close()
-	var b bytes.Buffer
-	cmdr := DryccCmd{WOut: &b, ConfigFile: cf}
-	// test rm file
-	server.Mux.HandleFunc("/v2/apps/example-go/volumes/myvolume/client/etc/hello.txt", func(w http.ResponseWriter, _ *http.Request) {
-		testutil.SetHeaders(w)
-		w.WriteHeader(http.StatusOK)
-	})
-	err = cmdr.VolumesClient("example-go", "rm", "vol://myvolume/etc/hello.txt")
-	assert.NoError(t, err)
+
+	output := b.String()
+	assert.Contains(t, output, "WebDAV service for volume myvolume is running.")
+	assert.Contains(t, output, "Endpoint:")
+	assert.Contains(t, output, "Username:")
+	assert.Contains(t, output, "Password:")
 }
 
 func TestVolumesExpand(t *testing.T) {