Merge pull request cli#53 from github/jg/perf-improvements

josebalius · web-flow · commit ebc8ce5adb62 · 2021-07-28T10:13:06.000-04:00
Liveshare client upgrade to v0.6.0
diff --git a/api/api.go b/api/api.go
@@ -133,8 +133,10 @@ const (
 )
 
 type CodespaceEnvironmentConnection struct {
-	SessionID    string `json:"sessionId"`
-	SessionToken string `json:"sessionToken"`
+	SessionID     string `json:"sessionId"`
+	SessionToken  string `json:"sessionToken"`
+	RelayEndpoint string `json:"relayEndpoint"`
+	RelaySAS      string `json:"relaySas"`
 }
 
 func (a *API) ListCodespaces(ctx context.Context, user *User) (Codespaces, error) {
diff --git a/cmd/ghcs/ports.go b/cmd/ghcs/ports.go
@@ -107,8 +107,8 @@ func Ports() error {
 
 }
 
-func getPorts(ctx context.Context, liveShareClient *liveshare.Client) (liveshare.Ports, error) {
-	server, err := liveShareClient.NewServer()
+func getPorts(ctx context.Context, lsclient *liveshare.Client) (liveshare.Ports, error) {
+	server, err := liveshare.NewServer(lsclient)
 	if err != nil {
 		return nil, fmt.Errorf("error creating server: %v", err)
 	}
@@ -214,12 +214,12 @@ func updatePortVisibility(codespaceName, sourcePort string, public bool) error {
 		return fmt.Errorf("error getting codespace: %v", err)
 	}
 
-	liveShareClient, err := codespaces.ConnectToLiveshare(ctx, apiClient, token, codespace)
+	lsclient, err := codespaces.ConnectToLiveshare(ctx, apiClient, token, codespace)
 	if err != nil {
 		return fmt.Errorf("error connecting to liveshare: %v", err)
 	}
 
-	server, err := liveShareClient.NewServer()
+	server, err := liveshare.NewServer(lsclient)
 	if err != nil {
 		return fmt.Errorf("error creating server: %v", err)
 	}
@@ -276,12 +276,12 @@ func forwardPort(codespaceName, sourcePort, destPort string) error {
 		return fmt.Errorf("error getting codespace: %v", err)
 	}
 
-	liveShareClient, err := codespaces.ConnectToLiveshare(ctx, apiClient, token, codespace)
+	lsclient, err := codespaces.ConnectToLiveshare(ctx, apiClient, token, codespace)
 	if err != nil {
 		return fmt.Errorf("error connecting to liveshare: %v", err)
 	}
 
-	server, err := liveShareClient.NewServer()
+	server, err := liveshare.NewServer(lsclient)
 	if err != nil {
 		return fmt.Errorf("error creating server: %v", err)
 	}
@@ -301,7 +301,7 @@ func forwardPort(codespaceName, sourcePort, destPort string) error {
 	}
 
 	fmt.Println("Forwarding port: " + sourcePort + " -> " + destPort)
-	portForwarder := liveshare.NewLocalPortForwarder(liveShareClient, server, dstPortInt)
+	portForwarder := liveshare.NewPortForwarder(lsclient, server, dstPortInt)
 	if err := portForwarder.Start(ctx); err != nil {
 		return fmt.Errorf("error forwarding port: %v", err)
 	}
diff --git a/cmd/ghcs/ssh.go b/cmd/ghcs/ssh.go
@@ -82,12 +82,12 @@ func SSH(sshProfile, codespaceName string, sshServerPort int) error {
 		}
 	}
 
-	liveShareClient, err := codespaces.ConnectToLiveshare(ctx, apiClient, token, codespace)
+	lsclient, err := codespaces.ConnectToLiveshare(ctx, apiClient, token, codespace)
 	if err != nil {
 		return fmt.Errorf("error connecting to liveshare: %v", err)
 	}
 
-	terminal, err := liveShareClient.NewTerminal()
+	terminal, err := liveshare.NewTerminal(lsclient)
 	if err != nil {
 		return fmt.Errorf("error creating liveshare terminal: %v", err)
 	}
@@ -106,7 +106,7 @@ func SSH(sshProfile, codespaceName string, sshServerPort int) error {
 		fmt.Printf("\n")
 	}
 
-	server, err := liveShareClient.NewServer()
+	server, err := liveshare.NewServer(lsclient)
 	if err != nil {
 		return fmt.Errorf("error creating server: %v", err)
 	}
@@ -121,7 +121,7 @@ func SSH(sshProfile, codespaceName string, sshServerPort int) error {
 		return fmt.Errorf("error sharing sshd port: %v", err)
 	}
 
-	portForwarder := liveshare.NewLocalPortForwarder(liveShareClient, server, port)
+	portForwarder := liveshare.NewPortForwarder(lsclient, server, port)
 	go func() {
 		if err := portForwarder.Start(ctx); err != nil {
 			panic(fmt.Errorf("error forwarding port: %v", err))
diff --git a/internal/codespaces/codespaces.go b/internal/codespaces/codespaces.go
@@ -93,18 +93,21 @@ func ConnectToLiveshare(ctx context.Context, apiClient *api.API, token string, c
 
 	fmt.Println("Connecting to your codespace...")
 
-	liveShare, err := liveshare.New(
-		liveshare.WithWorkspaceID(codespace.Environment.Connection.SessionID),
-		liveshare.WithToken(codespace.Environment.Connection.SessionToken),
+	lsclient, err := liveshare.NewClient(
+		liveshare.WithConnection(liveshare.Connection{
+			SessionID:     codespace.Environment.Connection.SessionID,
+			SessionToken:  codespace.Environment.Connection.SessionToken,
+			RelaySAS:      codespace.Environment.Connection.RelaySAS,
+			RelayEndpoint: codespace.Environment.Connection.RelayEndpoint,
+		}),
 	)
 	if err != nil {
 		return nil, fmt.Errorf("error creating live share: %v", err)
 	}
 
-	liveShareClient := liveShare.NewClient()
-	if err := liveShareClient.Join(ctx); err != nil {
+	if err := lsclient.Join(ctx); err != nil {
 		return nil, fmt.Errorf("error joining liveshare client: %v", err)
 	}
 
-	return liveShareClient, nil
+	return lsclient, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -133,8 +133,10 @@ const (`
`133`	`133`	`)`
`134`	`134`
`135`	`135`	`type CodespaceEnvironmentConnection struct {`
`136`		- SessionID string `json:"sessionId"`
`137`		- SessionToken string `json:"sessionToken"`
	`136`	+ SessionID string `json:"sessionId"`
	`137`	+ SessionToken string `json:"sessionToken"`
	`138`	+ RelayEndpoint string `json:"relayEndpoint"`
	`139`	+ RelaySAS string `json:"relaySas"`
`138`	`140`	`}`
`139`	`141`
`140`	`142`	`func (a API) ListCodespaces(ctx context.Context, user User) (Codespaces, error) {`
Original file line number	Diff line number	Diff line change
`@@ -107,8 +107,8 @@ func Ports() error {`
`107`	`107`
`108`	`108`	`}`
`109`	`109`
`110`		`-func getPorts(ctx context.Context, liveShareClient *liveshare.Client) (liveshare.Ports, error) {`
`111`		`- server, err := liveShareClient.NewServer()`
	`110`	`+func getPorts(ctx context.Context, lsclient *liveshare.Client) (liveshare.Ports, error) {`
	`111`	`+ server, err := liveshare.NewServer(lsclient)`
`112`	`112`	`if err != nil {`
`113`	`113`	`return nil, fmt.Errorf("error creating server: %v", err)`
`114`	`114`	`}`
`@@ -214,12 +214,12 @@ func updatePortVisibility(codespaceName, sourcePort string, public bool) error {`
`214`	`214`	`return fmt.Errorf("error getting codespace: %v", err)`
`215`	`215`	`}`
`216`	`216`
`217`		`- liveShareClient, err := codespaces.ConnectToLiveshare(ctx, apiClient, token, codespace)`
	`217`	`+ lsclient, err := codespaces.ConnectToLiveshare(ctx, apiClient, token, codespace)`
`218`	`218`	`if err != nil {`
`219`	`219`	`return fmt.Errorf("error connecting to liveshare: %v", err)`
`220`	`220`	`}`
`221`	`221`
`222`		`- server, err := liveShareClient.NewServer()`
	`222`	`+ server, err := liveshare.NewServer(lsclient)`
`223`	`223`	`if err != nil {`
`224`	`224`	`return fmt.Errorf("error creating server: %v", err)`
`225`	`225`	`}`
`@@ -276,12 +276,12 @@ func forwardPort(codespaceName, sourcePort, destPort string) error {`
`276`	`276`	`return fmt.Errorf("error getting codespace: %v", err)`
`277`	`277`	`}`
`278`	`278`
`279`		`- liveShareClient, err := codespaces.ConnectToLiveshare(ctx, apiClient, token, codespace)`
	`279`	`+ lsclient, err := codespaces.ConnectToLiveshare(ctx, apiClient, token, codespace)`
`280`	`280`	`if err != nil {`
`281`	`281`	`return fmt.Errorf("error connecting to liveshare: %v", err)`
`282`	`282`	`}`
`283`	`283`
`284`		`- server, err := liveShareClient.NewServer()`
	`284`	`+ server, err := liveshare.NewServer(lsclient)`
`285`	`285`	`if err != nil {`
`286`	`286`	`return fmt.Errorf("error creating server: %v", err)`
`287`	`287`	`}`
`@@ -301,7 +301,7 @@ func forwardPort(codespaceName, sourcePort, destPort string) error {`
`301`	`301`	`}`
`302`	`302`
`303`	`303`	`fmt.Println("Forwarding port: " + sourcePort + " -> " + destPort)`
`304`		`- portForwarder := liveshare.NewLocalPortForwarder(liveShareClient, server, dstPortInt)`
	`304`	`+ portForwarder := liveshare.NewPortForwarder(lsclient, server, dstPortInt)`
`305`	`305`	`if err := portForwarder.Start(ctx); err != nil {`
`306`	`306`	`return fmt.Errorf("error forwarding port: %v", err)`
`307`	`307`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,12 +82,12 @@ func SSH(sshProfile, codespaceName string, sshServerPort int) error {`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`
`85`		`- liveShareClient, err := codespaces.ConnectToLiveshare(ctx, apiClient, token, codespace)`
	`85`	`+ lsclient, err := codespaces.ConnectToLiveshare(ctx, apiClient, token, codespace)`
`86`	`86`	`if err != nil {`
`87`	`87`	`return fmt.Errorf("error connecting to liveshare: %v", err)`
`88`	`88`	`}`
`89`	`89`
`90`		`- terminal, err := liveShareClient.NewTerminal()`
	`90`	`+ terminal, err := liveshare.NewTerminal(lsclient)`
`91`	`91`	`if err != nil {`
`92`	`92`	`return fmt.Errorf("error creating liveshare terminal: %v", err)`
`93`	`93`	`}`
`@@ -106,7 +106,7 @@ func SSH(sshProfile, codespaceName string, sshServerPort int) error {`
`106`	`106`	`fmt.Printf("\n")`
`107`	`107`	`}`
`108`	`108`
`109`		`- server, err := liveShareClient.NewServer()`
	`109`	`+ server, err := liveshare.NewServer(lsclient)`
`110`	`110`	`if err != nil {`
`111`	`111`	`return fmt.Errorf("error creating server: %v", err)`
`112`	`112`	`}`
`@@ -121,7 +121,7 @@ func SSH(sshProfile, codespaceName string, sshServerPort int) error {`
`121`	`121`	`return fmt.Errorf("error sharing sshd port: %v", err)`
`122`	`122`	`}`
`123`	`123`
`124`		`- portForwarder := liveshare.NewLocalPortForwarder(liveShareClient, server, port)`
	`124`	`+ portForwarder := liveshare.NewPortForwarder(lsclient, server, port)`
`125`	`125`	`go func() {`
`126`	`126`	`if err := portForwarder.Start(ctx); err != nil {`
`127`	`127`	`panic(fmt.Errorf("error forwarding port: %v", err))`
Original file line number	Diff line number	Diff line change
`@@ -93,18 +93,21 @@ func ConnectToLiveshare(ctx context.Context, apiClient *api.API, token string, c`
`93`	`93`
`94`	`94`	`fmt.Println("Connecting to your codespace...")`
`95`	`95`
`96`		`- liveShare, err := liveshare.New(`
`97`		`- liveshare.WithWorkspaceID(codespace.Environment.Connection.SessionID),`
`98`		`- liveshare.WithToken(codespace.Environment.Connection.SessionToken),`
	`96`	`+ lsclient, err := liveshare.NewClient(`
	`97`	`+ liveshare.WithConnection(liveshare.Connection{`
	`98`	`+ SessionID: codespace.Environment.Connection.SessionID,`
	`99`	`+ SessionToken: codespace.Environment.Connection.SessionToken,`
	`100`	`+ RelaySAS: codespace.Environment.Connection.RelaySAS,`
	`101`	`+ RelayEndpoint: codespace.Environment.Connection.RelayEndpoint,`
	`102`	`+ }),`
`99`	`103`	`)`
`100`	`104`	`if err != nil {`
`101`	`105`	`return nil, fmt.Errorf("error creating live share: %v", err)`
`102`	`106`	`}`
`103`	`107`
`104`		`- liveShareClient := liveShare.NewClient()`
`105`		`- if err := liveShareClient.Join(ctx); err != nil {`
	`108`	`+ if err := lsclient.Join(ctx); err != nil {`
`106`	`109`	`return nil, fmt.Errorf("error joining liveshare client: %v", err)`
`107`	`110`	`}`
`108`	`111`
`109`		`- return liveShareClient, nil`
	`112`	`+ return lsclient, nil`
`110`	`113`	`}`