feat(workflow-cli): log support follow stream

Author: duanhongyi

cmd/apps.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"fmt"
+	"log"
 	"os"
 	"regexp"
 	"strings"
@@ -13,6 +14,7 @@ import (
 	"github.com/drycc/workflow-cli/pkg/logging"
 	"github.com/drycc/workflow-cli/pkg/webbrowser"
 	"github.com/drycc/workflow-cli/settings"
+	"github.com/gorilla/websocket"
 )
 
 // AppCreate creates an app.
@@ -158,22 +160,28 @@ func (d *DryccCmd) AppOpen(appID string) error {
 }
 
 // AppLogs returns the logs from an app.
-func (d *DryccCmd) AppLogs(appID string, lines int) error {
+func (d *DryccCmd) AppLogs(appID string, lines int, follow bool, timeout int) error {
 	s, appID, err := load(d.ConfigFile, appID)
 
 	if err != nil {
 		return err
 	}
 
-	logs, err := apps.Logs(s.Client, appID, lines)
-	if d.checkAPICompatibility(s.Client, err) != nil {
+	conn, err := apps.Logs(s.Client, appID, lines, follow, timeout)
+	if err != nil {
 		return err
 	}
-
-	for _, log := range strings.Split(strings.TrimRight(logs, `\n`), `\n`) {
-		logging.PrintLog(os.Stdout, log)
+	defer conn.Close()
+	for {
+		_, message, err := conn.ReadMessage()
+		if err != nil {
+			if websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway, websocket.CloseNormalClosure) {
+				log.Printf("error: %v", err)
+			}
+			break
+		}
+		logging.PrintLog(os.Stdout, strings.TrimRight(string(message), "\n"))
 	}
-
 	return nil
 }
 

cmd/cmd.go

@@ -14,7 +14,7 @@ type Commander interface {
 	AppsList(int) error
 	AppInfo(string) error
 	AppOpen(string) error
-	AppLogs(string, int) error
+	AppLogs(string, int, bool, int) error
 	AppRun(string, string, []string) error
 	AppDestroy(string, string) error
 	AppTransfer(string, string) error

cmd/ps.go

@@ -4,6 +4,7 @@ import (
 	"encoding/base64"
 	"fmt"
 	"io"
+	"log"
 	"os"
 	"regexp"
 	"strconv"
@@ -143,7 +144,10 @@ func printProcesses(appID string, input []api.Pods, wOut io.Writer) {
 func printExec(d *DryccCmd, conn *websocket.Conn) error {
 	messageType, message, err := conn.ReadMessage()
 	if err != nil {
-		return err
+		if websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway, websocket.CloseNormalClosure) {
+			log.Printf("error: %v", err)
+		}
+		return nil
 	}
 	if messageType == websocket.TextMessage {
 		d.Printf("%s", string(message))
@@ -166,6 +170,9 @@ func streamExec(conn *websocket.Conn) error {
 		for {
 			messageType, message, err := conn.ReadMessage()
 			if err != nil {
+				if websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway, websocket.CloseNormalClosure) {
+					log.Printf("error: %v", err)
+				}
 				break
 			} else if messageType == websocket.CloseMessage {
 				break

go.mod

@@ -4,7 +4,7 @@ go 1.19
 
 require (
 	github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815
-	github.com/drycc/controller-sdk-go v0.0.0-20220822080925-801edf7edf7b
+	github.com/drycc/controller-sdk-go v0.0.0-20220826021230-a1b71eb5e437
 	github.com/drycc/pkg v0.0.0-20210826011456-c60b87108840
 	github.com/gorilla/websocket v1.5.0
 	github.com/olekukonko/tablewriter v0.0.5

go.sum

@@ -49,8 +49,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815 h1:bWDMxwH3px2JBh6AyO7hdCn/PkvCZXii8TGj7sbtEbQ=
 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
-github.com/drycc/controller-sdk-go v0.0.0-20220822080925-801edf7edf7b h1:lMOLLsl/qBqiDbZ+vl2MU4H1AR9k3RW9I4DkaTVVdGg=
-github.com/drycc/controller-sdk-go v0.0.0-20220822080925-801edf7edf7b/go.mod h1:AWyrmGt7lPQ5Dd2HwO4zyOM/sfuBXVPlpw1Mr5kUZNg=
+github.com/drycc/controller-sdk-go v0.0.0-20220826021230-a1b71eb5e437 h1:pOEQvj0mZbWTwSYj/07FTrZ8NYaOLW2uH9IQP4hb378=
+github.com/drycc/controller-sdk-go v0.0.0-20220826021230-a1b71eb5e437/go.mod h1:AWyrmGt7lPQ5Dd2HwO4zyOM/sfuBXVPlpw1Mr5kUZNg=
 github.com/drycc/pkg v0.0.0-20210826011456-c60b87108840 h1:0OhP9AQ0mh3q0TMxK4PJTPSFwD/wj0xugiaZ3lnLcNA=
 github.com/drycc/pkg v0.0.0-20210826011456-c60b87108840/go.mod h1:KX1FLm7Fq6FLCsjjRsgfI/bMQuHZXqYf1ZXU9fzJhDw=
 github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=

parser/apps.go

@@ -1,7 +1,6 @@
 package parser
 
 import (
-	"strconv"
 	"strings"
 
 	docopt "github.com/docopt/docopt-go"
@@ -170,7 +169,11 @@ Options:
   -a --app=<app>
     the uniquely identifiable name for the application.
   -n --lines=<lines>
-    the number of lines to display
+    the number of lines to display.
+  -f --follow
+    specify if the logs should be streamed.
+  -t --timeout=<timeout>
+    the max seconds of follow the log stream.
 `
 
 	args, err := docopt.Parse(usage, argv, true, "", false, true)
@@ -180,21 +183,17 @@ Options:
 	}
 
 	app := safeGetValue(args, "--app")
-
-	linesStr := safeGetValue(args, "--lines")
-	var lines int
-
-	if linesStr == "" {
-		lines = -1
-	} else {
-		lines, err = strconv.Atoi(linesStr)
-
-		if err != nil {
-			return err
-		}
+	lines := safeGetInt(args, "--lines")
+	if lines <= 0 {
+		lines = 300
+	}
+	follow := args["--follow"].(bool)
+	timeout := safeGetInt(args, "--timeout")
+	if timeout <= 0 {
+		timeout = 300
 	}
 
-	return cmdr.AppLogs(app, lines)
+	return cmdr.AppLogs(app, lines, follow, timeout)
 }
 
 func appRun(argv []string, cmdr cmd.Commander) error {

parser/apps_test.go

@@ -28,7 +28,7 @@ func (d FakeDryccCmd) AppOpen(string) error {
 	return errors.New("apps:open")
 }
 
-func (d FakeDryccCmd) AppLogs(string, int) error {
+func (d FakeDryccCmd) AppLogs(string, int, bool, int) error {
 	return errors.New("apps:logs")
 }