Stream builder output in Compile command

Author: cmaglie

arduino/resources/install.go

@@ -123,5 +123,8 @@ func findPackageRoot(parent *paths.Path) (*paths.Path, error) {
 			return nil, fmt.Errorf("no unique root dir in archive, found '%s' and '%s'", root, file)
 		}
 	}
+	if root == nil {
+		return nil, fmt.Errorf("package does not contains any subfolder")
+	}
 	return root, nil
 }

cli/compile/compile.go

@@ -111,7 +111,7 @@ func run(cmd *cobra.Command, args []string) {
 		Quiet:           flags.quiet,
 		VidPid:          flags.vidPid,
 		ExportFile:      flags.exportFile,
-	})
+	}, os.Stdout)
 	if err == nil {
 		outputCompileResp(compRes)
 	} else {

commands/compile/compile.go

@@ -3,6 +3,7 @@ package compile
 import (
 	"context"
 	"fmt"
+	"io"
 	"path/filepath"
 	"sort"
 	"strings"
@@ -20,7 +21,7 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-func Compile(ctx context.Context, req *rpc.CompileReq) (*rpc.CompileResp, error) {
+func Compile(ctx context.Context, req *rpc.CompileReq, output io.Writer) (*rpc.CompileResp, error) {
 	logrus.Info("Executing `arduino compile`")
 	var sketchPath *paths.Path
 	if req.GetSketchPath() != "" {

daemon/client/client.go

@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 	"fmt"
+	"io"
 	"os"
 
 	"github.com/arduino/arduino-cli/rpc"
@@ -44,16 +45,27 @@ func main() {
 		fmt.Printf("Board name: %s\n", details.GetName())
 	}
 
-	compResp, err := client.Compile(context.Background(), &rpc.CompileReq{
+	compRespStream, err := client.Compile(context.Background(), &rpc.CompileReq{
 		Instance:   instance,
 		Fqbn:       "arduino:samd:mkr1000",
 		SketchPath: os.Args[2],
+		Verbose:    true,
 	})
 	if err != nil {
 		fmt.Printf("Compile error: %s\n", err)
 		os.Exit(1)
 	}
-	fmt.Printf("Compile response: %+v\n", compResp)
+	for {
+		compResp, err := compRespStream.Recv()
+		if err == io.EOF {
+			break
+		}
+		if err != nil {
+			fmt.Printf("Compile error: %s\n", err)
+			os.Exit(1)
+		}
+		fmt.Printf("%s", compResp.GetOutput())
+	}
 	/*
 		compile, err := client.Compile(context.Background(), &pb.CompileReq{})
 		if err != nil {

daemon/daemon.go

@@ -7,6 +7,7 @@ package daemon
 import (
 	"context"
 	"fmt"
+	"io"
 	"log"
 	"net"
 
@@ -49,6 +50,19 @@ func (s *ArduinoCoreServerImpl) Init(ctx context.Context, req *rpc.InitReq) (*rp
 	return commands.Init(ctx, req)
 }
 
-func (s *ArduinoCoreServerImpl) Compile(ctx context.Context, req *rpc.CompileReq) (*rpc.CompileResp, error) {
-	return compile.Compile(ctx, req)
+func (s *ArduinoCoreServerImpl) Compile(req *rpc.CompileReq, stream rpc.ArduinoCore_CompileServer) error {
+	r, w := io.Pipe()
+	go func() {
+		data := make([]byte, 1024)
+		for {
+			if n, err := r.Read(data); err != nil {
+				return
+			} else {
+				stream.Send(&rpc.CompileResp{Output: data[:n]})
+			}
+		}
+	}()
+	resp, err := compile.Compile(stream.Context(), req, w)
+	stream.Send(resp)
+	return err
 }

rpc/commands.pb.go

@@ -25,7 +25,7 @@ service ArduinoCore {
   // Requests details about a board
   rpc BoardDetails(BoardDetailsReq) returns (BoardDetailsResp);
 
-  rpc Compile(CompileReq) returns (CompileResp);
+  rpc Compile(CompileReq) returns (stream CompileResp);
 }
 
 // Configuration contains information to instantiate an Arduino Platform Service