internal/lsp: refactor LSP server instantiation
Previously, the process of instantiating and running the LSP server was
sharded across the lsp, protocol, and cmd packages, and this resulted in
some APIs that are hard to work with. For example, it's hard to guess
the difference between lsp.NewClientServer, lsp.NewServer,
protocol.NewServer (which returns a client), and protocol.NewClient
(which returns a server).
This change reorganizes Server instantiation as follows:
+ The lsp.Server is now purely an implementation of the protocol.Server
interface. It is no longer responsible for installing itself into the
jsonrpc2 Stream, nor for running itself.
+ A new package 'lsprpc' is added, to implement the logic of binding an
incoming connection to an LSP server session. This is put in a
separate package for lack of a clear home: it didn't really
philosophically belong in any of the lsp, cmd, or protocol packages.
We can perhaps move it to cmd in the future, but I'd like to keep it
as a separate package while I develop request forwarding.
simplified import graph:
jsonrpc2 ⭠ lsprpc ⭠ cmd
⭩ ⭦
lsp (t.b.d. client tests)
⭩ ⭨
protocol source
+ The jsonrpc2 package is extended to have a minimal API for running a
'StreamServer': something analogous to an HTTP server that listens
for new connections and delegates to a handler (but we couldn't use
the word 'Handler' for this delegate as it was already taken).
After these changes, I hope that the concerns of "serving the LSP",
"serving jsonrpc2", and "installing the LSP on jsonrpc2" are more
logically organized, though one legitimate criticism is that the word
'Server' is still heavily overloaded.
This change prepares a subsequent change which hijacks the jsonrpc2
connection when forwarding messages to a shared gopls instance.
To test this change, the following improvements are made:
+ A servertest package is added to make it easier to run a test against
an in-process jsonrpc2 server. For now, this uses TCP but it could
easily be modified to use io.Pipe.
+ cmd tests are updated to use the servertest package. Unfortunately it
wasn't yet possible to eliminate the concept of `remote=internal` in
favor of just using multiple sessions, because view initialization
involves calling both `go env` and `packages.Load`, which slow down
session startup significantly. See also golang.org/issue/35968.
Instead, the syntax for `-remote=internal` is modified to be
`-remote=internal@127.0.0.1:12345`.
+ An additional test for request cancellation is added for the
sessionserver package. This test uncovered a bug: when calling
Canceller.Cancel, we were using id rather than &id, which resulted in
incorrect json serialization (as only the pointer receiver implements
the json.Marshaller interface).
Updates golang/go#34111
Change-Id: I75c219df634348cdf53a9e57839b98588311a9ef
Reviewed-on: https://go-review.googlesource.com/c/tools/+/215742
Run-TryBot: Robert Findley <rfindley@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Rebecca Stambler <rstambler@golang.org>
Reviewed-by: Heschi Kreinick <heschi@google.com>
2020-01-21 17:34:50 -07:00
|
|
|
// Copyright 2020 The Go Authors. All rights reserved.
|
|
|
|
// Use of this source code is governed by a BSD-style
|
|
|
|
// license that can be found in the LICENSE file.
|
|
|
|
|
|
|
|
// Package lsprpc implements a jsonrpc2.StreamServer that may be used to
|
|
|
|
// serve the LSP on a jsonrpc2 channel.
|
|
|
|
package lsprpc
|
|
|
|
|
|
|
|
import (
|
|
|
|
"context"
|
2020-02-19 08:18:21 -07:00
|
|
|
"encoding/json"
|
2020-02-06 17:50:37 -07:00
|
|
|
"fmt"
|
2020-03-07 19:28:21 -07:00
|
|
|
"log"
|
2020-02-06 17:50:37 -07:00
|
|
|
"net"
|
2020-02-09 12:44:03 -07:00
|
|
|
"os"
|
2020-02-19 08:18:21 -07:00
|
|
|
"strconv"
|
|
|
|
"sync/atomic"
|
2020-02-10 09:34:13 -07:00
|
|
|
"time"
|
internal/lsp: refactor LSP server instantiation
Previously, the process of instantiating and running the LSP server was
sharded across the lsp, protocol, and cmd packages, and this resulted in
some APIs that are hard to work with. For example, it's hard to guess
the difference between lsp.NewClientServer, lsp.NewServer,
protocol.NewServer (which returns a client), and protocol.NewClient
(which returns a server).
This change reorganizes Server instantiation as follows:
+ The lsp.Server is now purely an implementation of the protocol.Server
interface. It is no longer responsible for installing itself into the
jsonrpc2 Stream, nor for running itself.
+ A new package 'lsprpc' is added, to implement the logic of binding an
incoming connection to an LSP server session. This is put in a
separate package for lack of a clear home: it didn't really
philosophically belong in any of the lsp, cmd, or protocol packages.
We can perhaps move it to cmd in the future, but I'd like to keep it
as a separate package while I develop request forwarding.
simplified import graph:
jsonrpc2 ⭠ lsprpc ⭠ cmd
⭩ ⭦
lsp (t.b.d. client tests)
⭩ ⭨
protocol source
+ The jsonrpc2 package is extended to have a minimal API for running a
'StreamServer': something analogous to an HTTP server that listens
for new connections and delegates to a handler (but we couldn't use
the word 'Handler' for this delegate as it was already taken).
After these changes, I hope that the concerns of "serving the LSP",
"serving jsonrpc2", and "installing the LSP on jsonrpc2" are more
logically organized, though one legitimate criticism is that the word
'Server' is still heavily overloaded.
This change prepares a subsequent change which hijacks the jsonrpc2
connection when forwarding messages to a shared gopls instance.
To test this change, the following improvements are made:
+ A servertest package is added to make it easier to run a test against
an in-process jsonrpc2 server. For now, this uses TCP but it could
easily be modified to use io.Pipe.
+ cmd tests are updated to use the servertest package. Unfortunately it
wasn't yet possible to eliminate the concept of `remote=internal` in
favor of just using multiple sessions, because view initialization
involves calling both `go env` and `packages.Load`, which slow down
session startup significantly. See also golang.org/issue/35968.
Instead, the syntax for `-remote=internal` is modified to be
`-remote=internal@127.0.0.1:12345`.
+ An additional test for request cancellation is added for the
sessionserver package. This test uncovered a bug: when calling
Canceller.Cancel, we were using id rather than &id, which resulted in
incorrect json serialization (as only the pointer receiver implements
the json.Marshaller interface).
Updates golang/go#34111
Change-Id: I75c219df634348cdf53a9e57839b98588311a9ef
Reviewed-on: https://go-review.googlesource.com/c/tools/+/215742
Run-TryBot: Robert Findley <rfindley@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Rebecca Stambler <rstambler@golang.org>
Reviewed-by: Heschi Kreinick <heschi@google.com>
2020-01-21 17:34:50 -07:00
|
|
|
|
2020-04-17 07:32:56 -06:00
|
|
|
"golang.org/x/tools/internal/event"
|
internal/lsp: refactor LSP server instantiation
Previously, the process of instantiating and running the LSP server was
sharded across the lsp, protocol, and cmd packages, and this resulted in
some APIs that are hard to work with. For example, it's hard to guess
the difference between lsp.NewClientServer, lsp.NewServer,
protocol.NewServer (which returns a client), and protocol.NewClient
(which returns a server).
This change reorganizes Server instantiation as follows:
+ The lsp.Server is now purely an implementation of the protocol.Server
interface. It is no longer responsible for installing itself into the
jsonrpc2 Stream, nor for running itself.
+ A new package 'lsprpc' is added, to implement the logic of binding an
incoming connection to an LSP server session. This is put in a
separate package for lack of a clear home: it didn't really
philosophically belong in any of the lsp, cmd, or protocol packages.
We can perhaps move it to cmd in the future, but I'd like to keep it
as a separate package while I develop request forwarding.
simplified import graph:
jsonrpc2 ⭠ lsprpc ⭠ cmd
⭩ ⭦
lsp (t.b.d. client tests)
⭩ ⭨
protocol source
+ The jsonrpc2 package is extended to have a minimal API for running a
'StreamServer': something analogous to an HTTP server that listens
for new connections and delegates to a handler (but we couldn't use
the word 'Handler' for this delegate as it was already taken).
After these changes, I hope that the concerns of "serving the LSP",
"serving jsonrpc2", and "installing the LSP on jsonrpc2" are more
logically organized, though one legitimate criticism is that the word
'Server' is still heavily overloaded.
This change prepares a subsequent change which hijacks the jsonrpc2
connection when forwarding messages to a shared gopls instance.
To test this change, the following improvements are made:
+ A servertest package is added to make it easier to run a test against
an in-process jsonrpc2 server. For now, this uses TCP but it could
easily be modified to use io.Pipe.
+ cmd tests are updated to use the servertest package. Unfortunately it
wasn't yet possible to eliminate the concept of `remote=internal` in
favor of just using multiple sessions, because view initialization
involves calling both `go env` and `packages.Load`, which slow down
session startup significantly. See also golang.org/issue/35968.
Instead, the syntax for `-remote=internal` is modified to be
`-remote=internal@127.0.0.1:12345`.
+ An additional test for request cancellation is added for the
sessionserver package. This test uncovered a bug: when calling
Canceller.Cancel, we were using id rather than &id, which resulted in
incorrect json serialization (as only the pointer receiver implements
the json.Marshaller interface).
Updates golang/go#34111
Change-Id: I75c219df634348cdf53a9e57839b98588311a9ef
Reviewed-on: https://go-review.googlesource.com/c/tools/+/215742
Run-TryBot: Robert Findley <rfindley@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Rebecca Stambler <rstambler@golang.org>
Reviewed-by: Heschi Kreinick <heschi@google.com>
2020-01-21 17:34:50 -07:00
|
|
|
"golang.org/x/tools/internal/jsonrpc2"
|
|
|
|
"golang.org/x/tools/internal/lsp"
|
2020-02-18 18:59:37 -07:00
|
|
|
"golang.org/x/tools/internal/lsp/cache"
|
2020-02-19 08:18:21 -07:00
|
|
|
"golang.org/x/tools/internal/lsp/debug"
|
internal/lsp: refactor LSP server instantiation
Previously, the process of instantiating and running the LSP server was
sharded across the lsp, protocol, and cmd packages, and this resulted in
some APIs that are hard to work with. For example, it's hard to guess
the difference between lsp.NewClientServer, lsp.NewServer,
protocol.NewServer (which returns a client), and protocol.NewClient
(which returns a server).
This change reorganizes Server instantiation as follows:
+ The lsp.Server is now purely an implementation of the protocol.Server
interface. It is no longer responsible for installing itself into the
jsonrpc2 Stream, nor for running itself.
+ A new package 'lsprpc' is added, to implement the logic of binding an
incoming connection to an LSP server session. This is put in a
separate package for lack of a clear home: it didn't really
philosophically belong in any of the lsp, cmd, or protocol packages.
We can perhaps move it to cmd in the future, but I'd like to keep it
as a separate package while I develop request forwarding.
simplified import graph:
jsonrpc2 ⭠ lsprpc ⭠ cmd
⭩ ⭦
lsp (t.b.d. client tests)
⭩ ⭨
protocol source
+ The jsonrpc2 package is extended to have a minimal API for running a
'StreamServer': something analogous to an HTTP server that listens
for new connections and delegates to a handler (but we couldn't use
the word 'Handler' for this delegate as it was already taken).
After these changes, I hope that the concerns of "serving the LSP",
"serving jsonrpc2", and "installing the LSP on jsonrpc2" are more
logically organized, though one legitimate criticism is that the word
'Server' is still heavily overloaded.
This change prepares a subsequent change which hijacks the jsonrpc2
connection when forwarding messages to a shared gopls instance.
To test this change, the following improvements are made:
+ A servertest package is added to make it easier to run a test against
an in-process jsonrpc2 server. For now, this uses TCP but it could
easily be modified to use io.Pipe.
+ cmd tests are updated to use the servertest package. Unfortunately it
wasn't yet possible to eliminate the concept of `remote=internal` in
favor of just using multiple sessions, because view initialization
involves calling both `go env` and `packages.Load`, which slow down
session startup significantly. See also golang.org/issue/35968.
Instead, the syntax for `-remote=internal` is modified to be
`-remote=internal@127.0.0.1:12345`.
+ An additional test for request cancellation is added for the
sessionserver package. This test uncovered a bug: when calling
Canceller.Cancel, we were using id rather than &id, which resulted in
incorrect json serialization (as only the pointer receiver implements
the json.Marshaller interface).
Updates golang/go#34111
Change-Id: I75c219df634348cdf53a9e57839b98588311a9ef
Reviewed-on: https://go-review.googlesource.com/c/tools/+/215742
Run-TryBot: Robert Findley <rfindley@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Rebecca Stambler <rstambler@golang.org>
Reviewed-by: Heschi Kreinick <heschi@google.com>
2020-01-21 17:34:50 -07:00
|
|
|
"golang.org/x/tools/internal/lsp/protocol"
|
|
|
|
)
|
|
|
|
|
2020-02-18 10:47:19 -07:00
|
|
|
// AutoNetwork is the pseudo network type used to signal that gopls should use
|
|
|
|
// automatic discovery to resolve a remote address.
|
|
|
|
const AutoNetwork = "auto"
|
|
|
|
|
2020-03-09 11:22:56 -06:00
|
|
|
// Unique identifiers for client/server.
|
|
|
|
var clientIndex, serverIndex int64
|
|
|
|
|
internal/lsp: refactor LSP server instantiation
Previously, the process of instantiating and running the LSP server was
sharded across the lsp, protocol, and cmd packages, and this resulted in
some APIs that are hard to work with. For example, it's hard to guess
the difference between lsp.NewClientServer, lsp.NewServer,
protocol.NewServer (which returns a client), and protocol.NewClient
(which returns a server).
This change reorganizes Server instantiation as follows:
+ The lsp.Server is now purely an implementation of the protocol.Server
interface. It is no longer responsible for installing itself into the
jsonrpc2 Stream, nor for running itself.
+ A new package 'lsprpc' is added, to implement the logic of binding an
incoming connection to an LSP server session. This is put in a
separate package for lack of a clear home: it didn't really
philosophically belong in any of the lsp, cmd, or protocol packages.
We can perhaps move it to cmd in the future, but I'd like to keep it
as a separate package while I develop request forwarding.
simplified import graph:
jsonrpc2 ⭠ lsprpc ⭠ cmd
⭩ ⭦
lsp (t.b.d. client tests)
⭩ ⭨
protocol source
+ The jsonrpc2 package is extended to have a minimal API for running a
'StreamServer': something analogous to an HTTP server that listens
for new connections and delegates to a handler (but we couldn't use
the word 'Handler' for this delegate as it was already taken).
After these changes, I hope that the concerns of "serving the LSP",
"serving jsonrpc2", and "installing the LSP on jsonrpc2" are more
logically organized, though one legitimate criticism is that the word
'Server' is still heavily overloaded.
This change prepares a subsequent change which hijacks the jsonrpc2
connection when forwarding messages to a shared gopls instance.
To test this change, the following improvements are made:
+ A servertest package is added to make it easier to run a test against
an in-process jsonrpc2 server. For now, this uses TCP but it could
easily be modified to use io.Pipe.
+ cmd tests are updated to use the servertest package. Unfortunately it
wasn't yet possible to eliminate the concept of `remote=internal` in
favor of just using multiple sessions, because view initialization
involves calling both `go env` and `packages.Load`, which slow down
session startup significantly. See also golang.org/issue/35968.
Instead, the syntax for `-remote=internal` is modified to be
`-remote=internal@127.0.0.1:12345`.
+ An additional test for request cancellation is added for the
sessionserver package. This test uncovered a bug: when calling
Canceller.Cancel, we were using id rather than &id, which resulted in
incorrect json serialization (as only the pointer receiver implements
the json.Marshaller interface).
Updates golang/go#34111
Change-Id: I75c219df634348cdf53a9e57839b98588311a9ef
Reviewed-on: https://go-review.googlesource.com/c/tools/+/215742
Run-TryBot: Robert Findley <rfindley@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Rebecca Stambler <rstambler@golang.org>
Reviewed-by: Heschi Kreinick <heschi@google.com>
2020-01-21 17:34:50 -07:00
|
|
|
// The StreamServer type is a jsonrpc2.StreamServer that handles incoming
|
|
|
|
// streams as a new LSP session, using a shared cache.
|
|
|
|
type StreamServer struct {
|
2020-03-26 20:00:12 -06:00
|
|
|
cache *cache.Cache
|
internal/lsp: refactor LSP server instantiation
Previously, the process of instantiating and running the LSP server was
sharded across the lsp, protocol, and cmd packages, and this resulted in
some APIs that are hard to work with. For example, it's hard to guess
the difference between lsp.NewClientServer, lsp.NewServer,
protocol.NewServer (which returns a client), and protocol.NewClient
(which returns a server).
This change reorganizes Server instantiation as follows:
+ The lsp.Server is now purely an implementation of the protocol.Server
interface. It is no longer responsible for installing itself into the
jsonrpc2 Stream, nor for running itself.
+ A new package 'lsprpc' is added, to implement the logic of binding an
incoming connection to an LSP server session. This is put in a
separate package for lack of a clear home: it didn't really
philosophically belong in any of the lsp, cmd, or protocol packages.
We can perhaps move it to cmd in the future, but I'd like to keep it
as a separate package while I develop request forwarding.
simplified import graph:
jsonrpc2 ⭠ lsprpc ⭠ cmd
⭩ ⭦
lsp (t.b.d. client tests)
⭩ ⭨
protocol source
+ The jsonrpc2 package is extended to have a minimal API for running a
'StreamServer': something analogous to an HTTP server that listens
for new connections and delegates to a handler (but we couldn't use
the word 'Handler' for this delegate as it was already taken).
After these changes, I hope that the concerns of "serving the LSP",
"serving jsonrpc2", and "installing the LSP on jsonrpc2" are more
logically organized, though one legitimate criticism is that the word
'Server' is still heavily overloaded.
This change prepares a subsequent change which hijacks the jsonrpc2
connection when forwarding messages to a shared gopls instance.
To test this change, the following improvements are made:
+ A servertest package is added to make it easier to run a test against
an in-process jsonrpc2 server. For now, this uses TCP but it could
easily be modified to use io.Pipe.
+ cmd tests are updated to use the servertest package. Unfortunately it
wasn't yet possible to eliminate the concept of `remote=internal` in
favor of just using multiple sessions, because view initialization
involves calling both `go env` and `packages.Load`, which slow down
session startup significantly. See also golang.org/issue/35968.
Instead, the syntax for `-remote=internal` is modified to be
`-remote=internal@127.0.0.1:12345`.
+ An additional test for request cancellation is added for the
sessionserver package. This test uncovered a bug: when calling
Canceller.Cancel, we were using id rather than &id, which resulted in
incorrect json serialization (as only the pointer receiver implements
the json.Marshaller interface).
Updates golang/go#34111
Change-Id: I75c219df634348cdf53a9e57839b98588311a9ef
Reviewed-on: https://go-review.googlesource.com/c/tools/+/215742
Run-TryBot: Robert Findley <rfindley@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Rebecca Stambler <rstambler@golang.org>
Reviewed-by: Heschi Kreinick <heschi@google.com>
2020-01-21 17:34:50 -07:00
|
|
|
|
2020-02-19 08:18:21 -07:00
|
|
|
// serverForTest may be set to a test fake for testing.
|
2020-02-19 08:17:48 -07:00
|
|
|
serverForTest protocol.Server
|
internal/lsp: refactor LSP server instantiation
Previously, the process of instantiating and running the LSP server was
sharded across the lsp, protocol, and cmd packages, and this resulted in
some APIs that are hard to work with. For example, it's hard to guess
the difference between lsp.NewClientServer, lsp.NewServer,
protocol.NewServer (which returns a client), and protocol.NewClient
(which returns a server).
This change reorganizes Server instantiation as follows:
+ The lsp.Server is now purely an implementation of the protocol.Server
interface. It is no longer responsible for installing itself into the
jsonrpc2 Stream, nor for running itself.
+ A new package 'lsprpc' is added, to implement the logic of binding an
incoming connection to an LSP server session. This is put in a
separate package for lack of a clear home: it didn't really
philosophically belong in any of the lsp, cmd, or protocol packages.
We can perhaps move it to cmd in the future, but I'd like to keep it
as a separate package while I develop request forwarding.
simplified import graph:
jsonrpc2 ⭠ lsprpc ⭠ cmd
⭩ ⭦
lsp (t.b.d. client tests)
⭩ ⭨
protocol source
+ The jsonrpc2 package is extended to have a minimal API for running a
'StreamServer': something analogous to an HTTP server that listens
for new connections and delegates to a handler (but we couldn't use
the word 'Handler' for this delegate as it was already taken).
After these changes, I hope that the concerns of "serving the LSP",
"serving jsonrpc2", and "installing the LSP on jsonrpc2" are more
logically organized, though one legitimate criticism is that the word
'Server' is still heavily overloaded.
This change prepares a subsequent change which hijacks the jsonrpc2
connection when forwarding messages to a shared gopls instance.
To test this change, the following improvements are made:
+ A servertest package is added to make it easier to run a test against
an in-process jsonrpc2 server. For now, this uses TCP but it could
easily be modified to use io.Pipe.
+ cmd tests are updated to use the servertest package. Unfortunately it
wasn't yet possible to eliminate the concept of `remote=internal` in
favor of just using multiple sessions, because view initialization
involves calling both `go env` and `packages.Load`, which slow down
session startup significantly. See also golang.org/issue/35968.
Instead, the syntax for `-remote=internal` is modified to be
`-remote=internal@127.0.0.1:12345`.
+ An additional test for request cancellation is added for the
sessionserver package. This test uncovered a bug: when calling
Canceller.Cancel, we were using id rather than &id, which resulted in
incorrect json serialization (as only the pointer receiver implements
the json.Marshaller interface).
Updates golang/go#34111
Change-Id: I75c219df634348cdf53a9e57839b98588311a9ef
Reviewed-on: https://go-review.googlesource.com/c/tools/+/215742
Run-TryBot: Robert Findley <rfindley@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Rebecca Stambler <rstambler@golang.org>
Reviewed-by: Heschi Kreinick <heschi@google.com>
2020-01-21 17:34:50 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
// NewStreamServer creates a StreamServer using the shared cache. If
|
|
|
|
// withTelemetry is true, each session is instrumented with telemetry that
|
|
|
|
// records RPC statistics.
|
2020-03-26 20:00:12 -06:00
|
|
|
func NewStreamServer(cache *cache.Cache) *StreamServer {
|
|
|
|
return &StreamServer{cache: cache}
|
internal/lsp: refactor LSP server instantiation
Previously, the process of instantiating and running the LSP server was
sharded across the lsp, protocol, and cmd packages, and this resulted in
some APIs that are hard to work with. For example, it's hard to guess
the difference between lsp.NewClientServer, lsp.NewServer,
protocol.NewServer (which returns a client), and protocol.NewClient
(which returns a server).
This change reorganizes Server instantiation as follows:
+ The lsp.Server is now purely an implementation of the protocol.Server
interface. It is no longer responsible for installing itself into the
jsonrpc2 Stream, nor for running itself.
+ A new package 'lsprpc' is added, to implement the logic of binding an
incoming connection to an LSP server session. This is put in a
separate package for lack of a clear home: it didn't really
philosophically belong in any of the lsp, cmd, or protocol packages.
We can perhaps move it to cmd in the future, but I'd like to keep it
as a separate package while I develop request forwarding.
simplified import graph:
jsonrpc2 ⭠ lsprpc ⭠ cmd
⭩ ⭦
lsp (t.b.d. client tests)
⭩ ⭨
protocol source
+ The jsonrpc2 package is extended to have a minimal API for running a
'StreamServer': something analogous to an HTTP server that listens
for new connections and delegates to a handler (but we couldn't use
the word 'Handler' for this delegate as it was already taken).
After these changes, I hope that the concerns of "serving the LSP",
"serving jsonrpc2", and "installing the LSP on jsonrpc2" are more
logically organized, though one legitimate criticism is that the word
'Server' is still heavily overloaded.
This change prepares a subsequent change which hijacks the jsonrpc2
connection when forwarding messages to a shared gopls instance.
To test this change, the following improvements are made:
+ A servertest package is added to make it easier to run a test against
an in-process jsonrpc2 server. For now, this uses TCP but it could
easily be modified to use io.Pipe.
+ cmd tests are updated to use the servertest package. Unfortunately it
wasn't yet possible to eliminate the concept of `remote=internal` in
favor of just using multiple sessions, because view initialization
involves calling both `go env` and `packages.Load`, which slow down
session startup significantly. See also golang.org/issue/35968.
Instead, the syntax for `-remote=internal` is modified to be
`-remote=internal@127.0.0.1:12345`.
+ An additional test for request cancellation is added for the
sessionserver package. This test uncovered a bug: when calling
Canceller.Cancel, we were using id rather than &id, which resulted in
incorrect json serialization (as only the pointer receiver implements
the json.Marshaller interface).
Updates golang/go#34111
Change-Id: I75c219df634348cdf53a9e57839b98588311a9ef
Reviewed-on: https://go-review.googlesource.com/c/tools/+/215742
Run-TryBot: Robert Findley <rfindley@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Rebecca Stambler <rstambler@golang.org>
Reviewed-by: Heschi Kreinick <heschi@google.com>
2020-01-21 17:34:50 -07:00
|
|
|
}
|
|
|
|
|
2020-02-19 08:18:21 -07:00
|
|
|
// debugInstance is the common functionality shared between client and server
|
|
|
|
// gopls instances.
|
|
|
|
type debugInstance struct {
|
|
|
|
id string
|
|
|
|
debugAddress string
|
|
|
|
logfile string
|
2020-02-18 10:47:19 -07:00
|
|
|
goplsPath string
|
2020-02-19 08:18:21 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
func (d debugInstance) ID() string {
|
|
|
|
return d.id
|
|
|
|
}
|
|
|
|
|
|
|
|
func (d debugInstance) DebugAddress() string {
|
|
|
|
return d.debugAddress
|
|
|
|
}
|
|
|
|
|
|
|
|
func (d debugInstance) Logfile() string {
|
|
|
|
return d.logfile
|
|
|
|
}
|
|
|
|
|
2020-02-18 10:47:19 -07:00
|
|
|
func (d debugInstance) GoplsPath() string {
|
|
|
|
return d.goplsPath
|
|
|
|
}
|
|
|
|
|
2020-02-19 08:18:21 -07:00
|
|
|
// A debugServer is held by the client to identity the remove server to which
|
|
|
|
// it is connected.
|
|
|
|
type debugServer struct {
|
|
|
|
debugInstance
|
|
|
|
// clientID is the id of this client on the server.
|
|
|
|
clientID string
|
|
|
|
}
|
|
|
|
|
|
|
|
func (s debugServer) ClientID() string {
|
|
|
|
return s.clientID
|
|
|
|
}
|
|
|
|
|
|
|
|
// A debugClient is held by the server to identify an incoming client
|
|
|
|
// connection.
|
|
|
|
type debugClient struct {
|
|
|
|
debugInstance
|
|
|
|
// session is the session serving this client.
|
|
|
|
session *cache.Session
|
|
|
|
// serverID is this id of this server on the client.
|
|
|
|
serverID string
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c debugClient) Session() debug.Session {
|
|
|
|
return cache.DebugSession{Session: c.session}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c debugClient) ServerID() string {
|
|
|
|
return c.serverID
|
|
|
|
}
|
|
|
|
|
internal/lsp: refactor LSP server instantiation
Previously, the process of instantiating and running the LSP server was
sharded across the lsp, protocol, and cmd packages, and this resulted in
some APIs that are hard to work with. For example, it's hard to guess
the difference between lsp.NewClientServer, lsp.NewServer,
protocol.NewServer (which returns a client), and protocol.NewClient
(which returns a server).
This change reorganizes Server instantiation as follows:
+ The lsp.Server is now purely an implementation of the protocol.Server
interface. It is no longer responsible for installing itself into the
jsonrpc2 Stream, nor for running itself.
+ A new package 'lsprpc' is added, to implement the logic of binding an
incoming connection to an LSP server session. This is put in a
separate package for lack of a clear home: it didn't really
philosophically belong in any of the lsp, cmd, or protocol packages.
We can perhaps move it to cmd in the future, but I'd like to keep it
as a separate package while I develop request forwarding.
simplified import graph:
jsonrpc2 ⭠ lsprpc ⭠ cmd
⭩ ⭦
lsp (t.b.d. client tests)
⭩ ⭨
protocol source
+ The jsonrpc2 package is extended to have a minimal API for running a
'StreamServer': something analogous to an HTTP server that listens
for new connections and delegates to a handler (but we couldn't use
the word 'Handler' for this delegate as it was already taken).
After these changes, I hope that the concerns of "serving the LSP",
"serving jsonrpc2", and "installing the LSP on jsonrpc2" are more
logically organized, though one legitimate criticism is that the word
'Server' is still heavily overloaded.
This change prepares a subsequent change which hijacks the jsonrpc2
connection when forwarding messages to a shared gopls instance.
To test this change, the following improvements are made:
+ A servertest package is added to make it easier to run a test against
an in-process jsonrpc2 server. For now, this uses TCP but it could
easily be modified to use io.Pipe.
+ cmd tests are updated to use the servertest package. Unfortunately it
wasn't yet possible to eliminate the concept of `remote=internal` in
favor of just using multiple sessions, because view initialization
involves calling both `go env` and `packages.Load`, which slow down
session startup significantly. See also golang.org/issue/35968.
Instead, the syntax for `-remote=internal` is modified to be
`-remote=internal@127.0.0.1:12345`.
+ An additional test for request cancellation is added for the
sessionserver package. This test uncovered a bug: when calling
Canceller.Cancel, we were using id rather than &id, which resulted in
incorrect json serialization (as only the pointer receiver implements
the json.Marshaller interface).
Updates golang/go#34111
Change-Id: I75c219df634348cdf53a9e57839b98588311a9ef
Reviewed-on: https://go-review.googlesource.com/c/tools/+/215742
Run-TryBot: Robert Findley <rfindley@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Rebecca Stambler <rstambler@golang.org>
Reviewed-by: Heschi Kreinick <heschi@google.com>
2020-01-21 17:34:50 -07:00
|
|
|
// ServeStream implements the jsonrpc2.StreamServer interface, by handling
|
|
|
|
// incoming streams using a new lsp server.
|
|
|
|
func (s *StreamServer) ServeStream(ctx context.Context, stream jsonrpc2.Stream) error {
|
2020-02-19 08:18:21 -07:00
|
|
|
index := atomic.AddInt64(&clientIndex, 1)
|
|
|
|
|
internal/lsp: refactor LSP server instantiation
Previously, the process of instantiating and running the LSP server was
sharded across the lsp, protocol, and cmd packages, and this resulted in
some APIs that are hard to work with. For example, it's hard to guess
the difference between lsp.NewClientServer, lsp.NewServer,
protocol.NewServer (which returns a client), and protocol.NewClient
(which returns a server).
This change reorganizes Server instantiation as follows:
+ The lsp.Server is now purely an implementation of the protocol.Server
interface. It is no longer responsible for installing itself into the
jsonrpc2 Stream, nor for running itself.
+ A new package 'lsprpc' is added, to implement the logic of binding an
incoming connection to an LSP server session. This is put in a
separate package for lack of a clear home: it didn't really
philosophically belong in any of the lsp, cmd, or protocol packages.
We can perhaps move it to cmd in the future, but I'd like to keep it
as a separate package while I develop request forwarding.
simplified import graph:
jsonrpc2 ⭠ lsprpc ⭠ cmd
⭩ ⭦
lsp (t.b.d. client tests)
⭩ ⭨
protocol source
+ The jsonrpc2 package is extended to have a minimal API for running a
'StreamServer': something analogous to an HTTP server that listens
for new connections and delegates to a handler (but we couldn't use
the word 'Handler' for this delegate as it was already taken).
After these changes, I hope that the concerns of "serving the LSP",
"serving jsonrpc2", and "installing the LSP on jsonrpc2" are more
logically organized, though one legitimate criticism is that the word
'Server' is still heavily overloaded.
This change prepares a subsequent change which hijacks the jsonrpc2
connection when forwarding messages to a shared gopls instance.
To test this change, the following improvements are made:
+ A servertest package is added to make it easier to run a test against
an in-process jsonrpc2 server. For now, this uses TCP but it could
easily be modified to use io.Pipe.
+ cmd tests are updated to use the servertest package. Unfortunately it
wasn't yet possible to eliminate the concept of `remote=internal` in
favor of just using multiple sessions, because view initialization
involves calling both `go env` and `packages.Load`, which slow down
session startup significantly. See also golang.org/issue/35968.
Instead, the syntax for `-remote=internal` is modified to be
`-remote=internal@127.0.0.1:12345`.
+ An additional test for request cancellation is added for the
sessionserver package. This test uncovered a bug: when calling
Canceller.Cancel, we were using id rather than &id, which resulted in
incorrect json serialization (as only the pointer receiver implements
the json.Marshaller interface).
Updates golang/go#34111
Change-Id: I75c219df634348cdf53a9e57839b98588311a9ef
Reviewed-on: https://go-review.googlesource.com/c/tools/+/215742
Run-TryBot: Robert Findley <rfindley@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Rebecca Stambler <rstambler@golang.org>
Reviewed-by: Heschi Kreinick <heschi@google.com>
2020-01-21 17:34:50 -07:00
|
|
|
conn := jsonrpc2.NewConn(stream)
|
|
|
|
client := protocol.ClientDispatcher(conn)
|
2020-02-28 08:30:03 -07:00
|
|
|
session := s.cache.NewSession(ctx)
|
2020-02-19 08:18:21 -07:00
|
|
|
dc := &debugClient{
|
|
|
|
debugInstance: debugInstance{
|
|
|
|
id: strconv.FormatInt(index, 10),
|
|
|
|
},
|
|
|
|
session: session,
|
|
|
|
}
|
2020-02-28 08:30:03 -07:00
|
|
|
if di := debug.GetInstance(ctx); di != nil {
|
|
|
|
di.State.AddClient(dc)
|
|
|
|
defer di.State.DropClient(dc)
|
|
|
|
}
|
2020-02-19 08:17:48 -07:00
|
|
|
server := s.serverForTest
|
|
|
|
if server == nil {
|
2020-02-19 08:18:21 -07:00
|
|
|
server = lsp.NewServer(session, client)
|
2020-02-19 08:17:48 -07:00
|
|
|
}
|
2020-02-21 15:31:45 -07:00
|
|
|
// Clients may or may not send a shutdown message. Make sure the server is
|
|
|
|
// shut down.
|
|
|
|
// TODO(rFindley): this shutdown should perhaps be on a disconnected context.
|
2020-03-09 11:22:56 -06:00
|
|
|
defer func() {
|
|
|
|
if err := server.Shutdown(ctx); err != nil {
|
|
|
|
event.Error(ctx, "error shutting down", err)
|
|
|
|
}
|
|
|
|
}()
|
2020-02-18 10:47:19 -07:00
|
|
|
executable, err := os.Executable()
|
|
|
|
if err != nil {
|
2020-03-07 19:28:21 -07:00
|
|
|
log.Printf("error getting gopls path: %v", err)
|
2020-02-18 10:47:19 -07:00
|
|
|
executable = ""
|
|
|
|
}
|
2020-03-30 15:09:42 -06:00
|
|
|
ctx = protocol.WithClient(ctx, client)
|
2020-04-29 06:51:37 -06:00
|
|
|
conn.Go(ctx,
|
2020-04-02 10:43:08 -06:00
|
|
|
protocol.Handlers(
|
|
|
|
handshaker(dc, executable,
|
|
|
|
protocol.ServerHandler(server,
|
|
|
|
jsonrpc2.MethodNotFound))))
|
2020-04-29 06:51:37 -06:00
|
|
|
<-conn.Done()
|
|
|
|
return conn.Err()
|
internal/lsp: refactor LSP server instantiation
Previously, the process of instantiating and running the LSP server was
sharded across the lsp, protocol, and cmd packages, and this resulted in
some APIs that are hard to work with. For example, it's hard to guess
the difference between lsp.NewClientServer, lsp.NewServer,
protocol.NewServer (which returns a client), and protocol.NewClient
(which returns a server).
This change reorganizes Server instantiation as follows:
+ The lsp.Server is now purely an implementation of the protocol.Server
interface. It is no longer responsible for installing itself into the
jsonrpc2 Stream, nor for running itself.
+ A new package 'lsprpc' is added, to implement the logic of binding an
incoming connection to an LSP server session. This is put in a
separate package for lack of a clear home: it didn't really
philosophically belong in any of the lsp, cmd, or protocol packages.
We can perhaps move it to cmd in the future, but I'd like to keep it
as a separate package while I develop request forwarding.
simplified import graph:
jsonrpc2 ⭠ lsprpc ⭠ cmd
⭩ ⭦
lsp (t.b.d. client tests)
⭩ ⭨
protocol source
+ The jsonrpc2 package is extended to have a minimal API for running a
'StreamServer': something analogous to an HTTP server that listens
for new connections and delegates to a handler (but we couldn't use
the word 'Handler' for this delegate as it was already taken).
After these changes, I hope that the concerns of "serving the LSP",
"serving jsonrpc2", and "installing the LSP on jsonrpc2" are more
logically organized, though one legitimate criticism is that the word
'Server' is still heavily overloaded.
This change prepares a subsequent change which hijacks the jsonrpc2
connection when forwarding messages to a shared gopls instance.
To test this change, the following improvements are made:
+ A servertest package is added to make it easier to run a test against
an in-process jsonrpc2 server. For now, this uses TCP but it could
easily be modified to use io.Pipe.
+ cmd tests are updated to use the servertest package. Unfortunately it
wasn't yet possible to eliminate the concept of `remote=internal` in
favor of just using multiple sessions, because view initialization
involves calling both `go env` and `packages.Load`, which slow down
session startup significantly. See also golang.org/issue/35968.
Instead, the syntax for `-remote=internal` is modified to be
`-remote=internal@127.0.0.1:12345`.
+ An additional test for request cancellation is added for the
sessionserver package. This test uncovered a bug: when calling
Canceller.Cancel, we were using id rather than &id, which resulted in
incorrect json serialization (as only the pointer receiver implements
the json.Marshaller interface).
Updates golang/go#34111
Change-Id: I75c219df634348cdf53a9e57839b98588311a9ef
Reviewed-on: https://go-review.googlesource.com/c/tools/+/215742
Run-TryBot: Robert Findley <rfindley@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Rebecca Stambler <rstambler@golang.org>
Reviewed-by: Heschi Kreinick <heschi@google.com>
2020-01-21 17:34:50 -07:00
|
|
|
}
|
2020-02-06 17:50:37 -07:00
|
|
|
|
|
|
|
// A Forwarder is a jsonrpc2.StreamServer that handles an LSP stream by
|
|
|
|
// forwarding it to a remote. This is used when the gopls process started by
|
|
|
|
// the editor is in the `-remote` mode, which means it finds and connects to a
|
|
|
|
// separate gopls daemon. In these cases, we still want the forwarder gopls to
|
|
|
|
// be instrumented with telemetry, and want to be able to in some cases hijack
|
|
|
|
// the jsonrpc2 connection with the daemon.
|
|
|
|
type Forwarder struct {
|
2020-02-10 09:34:13 -07:00
|
|
|
network, addr string
|
|
|
|
|
2020-03-09 11:22:56 -06:00
|
|
|
// goplsPath is the path to the current executing gopls binary.
|
|
|
|
goplsPath string
|
|
|
|
|
|
|
|
// configuration
|
|
|
|
dialTimeout time.Duration
|
|
|
|
retries int
|
|
|
|
remoteDebug string
|
|
|
|
remoteListenTimeout time.Duration
|
|
|
|
remoteLogfile string
|
|
|
|
}
|
|
|
|
|
|
|
|
// A ForwarderOption configures the behavior of the LSP forwarder.
|
|
|
|
type ForwarderOption interface {
|
|
|
|
setForwarder(*Forwarder)
|
|
|
|
}
|
|
|
|
|
|
|
|
// RemoteDebugAddress configures the address used by the auto-started Gopls daemon
|
|
|
|
// for serving debug information.
|
|
|
|
type RemoteDebugAddress string
|
|
|
|
|
|
|
|
func (d RemoteDebugAddress) setForwarder(fwd *Forwarder) {
|
|
|
|
fwd.remoteDebug = string(d)
|
|
|
|
}
|
|
|
|
|
|
|
|
// RemoteListenTimeout configures the amount of time the auto-started gopls
|
|
|
|
// daemon will wait with no client connections before shutting down.
|
|
|
|
type RemoteListenTimeout time.Duration
|
|
|
|
|
|
|
|
func (d RemoteListenTimeout) setForwarder(fwd *Forwarder) {
|
|
|
|
fwd.remoteListenTimeout = time.Duration(d)
|
|
|
|
}
|
|
|
|
|
|
|
|
// RemoteLogfile configures the logfile location for the auto-started gopls
|
|
|
|
// daemon.
|
|
|
|
type RemoteLogfile string
|
|
|
|
|
|
|
|
func (l RemoteLogfile) setForwarder(fwd *Forwarder) {
|
|
|
|
fwd.remoteLogfile = string(l)
|
2020-02-06 17:50:37 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
// NewForwarder creates a new Forwarder, ready to forward connections to the
|
2020-02-10 09:34:13 -07:00
|
|
|
// remote server specified by network and addr.
|
2020-03-09 11:22:56 -06:00
|
|
|
func NewForwarder(network, addr string, opts ...ForwarderOption) *Forwarder {
|
2020-02-18 10:47:19 -07:00
|
|
|
gp, err := os.Executable()
|
|
|
|
if err != nil {
|
2020-03-07 19:28:21 -07:00
|
|
|
log.Printf("error getting gopls path for forwarder: %v", err)
|
2020-02-18 10:47:19 -07:00
|
|
|
gp = ""
|
|
|
|
}
|
2020-02-21 15:31:45 -07:00
|
|
|
|
2020-03-09 11:22:56 -06:00
|
|
|
fwd := &Forwarder{
|
|
|
|
network: network,
|
|
|
|
addr: addr,
|
|
|
|
goplsPath: gp,
|
|
|
|
dialTimeout: 1 * time.Second,
|
|
|
|
retries: 5,
|
|
|
|
remoteLogfile: "auto",
|
|
|
|
remoteListenTimeout: 1 * time.Minute,
|
|
|
|
}
|
|
|
|
for _, opt := range opts {
|
|
|
|
opt.setForwarder(fwd)
|
2020-02-06 17:50:37 -07:00
|
|
|
}
|
2020-03-09 11:22:56 -06:00
|
|
|
return fwd
|
2020-02-06 17:50:37 -07:00
|
|
|
}
|
|
|
|
|
2020-03-06 08:02:36 -07:00
|
|
|
// QueryServerState queries the server state of the current server.
|
|
|
|
func QueryServerState(ctx context.Context, network, address string) (*ServerState, error) {
|
|
|
|
if network == AutoNetwork {
|
|
|
|
gp, err := os.Executable()
|
|
|
|
if err != nil {
|
2020-05-01 08:05:39 -06:00
|
|
|
return nil, fmt.Errorf("getting gopls path: %w", err)
|
2020-03-06 08:02:36 -07:00
|
|
|
}
|
|
|
|
network, address = autoNetworkAddress(gp, address)
|
|
|
|
}
|
|
|
|
netConn, err := net.DialTimeout(network, address, 5*time.Second)
|
|
|
|
if err != nil {
|
2020-05-01 08:05:39 -06:00
|
|
|
return nil, fmt.Errorf("dialing remote: %w", err)
|
2020-03-06 08:02:36 -07:00
|
|
|
}
|
2020-04-27 13:35:20 -06:00
|
|
|
serverConn := jsonrpc2.NewConn(jsonrpc2.NewHeaderStream(netConn))
|
2020-04-29 06:51:37 -06:00
|
|
|
serverConn.Go(ctx, jsonrpc2.MethodNotFound)
|
2020-03-06 08:02:36 -07:00
|
|
|
var state ServerState
|
2020-04-07 19:35:47 -06:00
|
|
|
if err := protocol.Call(ctx, serverConn, sessionsMethod, nil, &state); err != nil {
|
2020-05-01 08:05:39 -06:00
|
|
|
return nil, fmt.Errorf("querying server state: %w", err)
|
2020-03-06 08:02:36 -07:00
|
|
|
}
|
|
|
|
return &state, nil
|
|
|
|
}
|
|
|
|
|
2020-02-06 17:50:37 -07:00
|
|
|
// ServeStream dials the forwarder remote and binds the remote to serve the LSP
|
|
|
|
// on the incoming stream.
|
|
|
|
func (f *Forwarder) ServeStream(ctx context.Context, stream jsonrpc2.Stream) error {
|
|
|
|
clientConn := jsonrpc2.NewConn(stream)
|
|
|
|
client := protocol.ClientDispatcher(clientConn)
|
|
|
|
|
2020-02-18 10:47:19 -07:00
|
|
|
netConn, err := f.connectToRemote(ctx)
|
2020-02-06 17:50:37 -07:00
|
|
|
if err != nil {
|
2020-05-01 08:05:39 -06:00
|
|
|
return fmt.Errorf("forwarder: connecting to remote: %w", err)
|
2020-02-06 17:50:37 -07:00
|
|
|
}
|
2020-04-27 13:35:20 -06:00
|
|
|
serverConn := jsonrpc2.NewConn(jsonrpc2.NewHeaderStream(netConn))
|
2020-02-06 17:50:37 -07:00
|
|
|
server := protocol.ServerDispatcher(serverConn)
|
|
|
|
|
|
|
|
// Forward between connections.
|
2020-04-29 06:51:37 -06:00
|
|
|
serverConn.Go(ctx,
|
|
|
|
protocol.Handlers(
|
|
|
|
protocol.ClientHandler(client,
|
|
|
|
jsonrpc2.MethodNotFound)))
|
2020-02-25 10:01:11 -07:00
|
|
|
// Don't run the clientConn yet, so that we can complete the handshake before
|
|
|
|
// processing any client messages.
|
2020-02-19 08:18:21 -07:00
|
|
|
|
|
|
|
// Do a handshake with the server instance to exchange debug information.
|
|
|
|
index := atomic.AddInt64(&serverIndex, 1)
|
|
|
|
serverID := strconv.FormatInt(index, 10)
|
2020-02-28 08:30:03 -07:00
|
|
|
di := debug.GetInstance(ctx)
|
2020-02-19 08:18:21 -07:00
|
|
|
var (
|
|
|
|
hreq = handshakeRequest{
|
|
|
|
ServerID: serverID,
|
2020-02-18 10:47:19 -07:00
|
|
|
GoplsPath: f.goplsPath,
|
2020-02-19 08:18:21 -07:00
|
|
|
}
|
|
|
|
hresp handshakeResponse
|
|
|
|
)
|
2020-02-28 08:30:03 -07:00
|
|
|
if di != nil {
|
|
|
|
hreq.Logfile = di.Logfile
|
|
|
|
hreq.DebugAddr = di.ListenedDebugAddress
|
|
|
|
}
|
2020-04-07 19:35:47 -06:00
|
|
|
if err := protocol.Call(ctx, serverConn, handshakeMethod, hreq, &hresp); err != nil {
|
2020-03-07 19:28:21 -07:00
|
|
|
event.Error(ctx, "forwarder: gopls handshake failed", err)
|
2020-02-18 10:47:19 -07:00
|
|
|
}
|
|
|
|
if hresp.GoplsPath != f.goplsPath {
|
2020-03-07 19:28:21 -07:00
|
|
|
event.Error(ctx, "", fmt.Errorf("forwarder: gopls path mismatch: forwarder is %q, remote is %q", f.goplsPath, hresp.GoplsPath))
|
2020-02-19 08:18:21 -07:00
|
|
|
}
|
2020-02-28 08:30:03 -07:00
|
|
|
if di != nil {
|
|
|
|
di.State.AddServer(debugServer{
|
|
|
|
debugInstance: debugInstance{
|
|
|
|
id: serverID,
|
|
|
|
logfile: hresp.Logfile,
|
|
|
|
debugAddress: hresp.DebugAddr,
|
|
|
|
goplsPath: hresp.GoplsPath,
|
|
|
|
},
|
|
|
|
clientID: hresp.ClientID,
|
|
|
|
})
|
|
|
|
}
|
2020-04-29 06:51:37 -06:00
|
|
|
clientConn.Go(ctx,
|
|
|
|
protocol.Handlers(
|
2020-04-30 13:59:37 -06:00
|
|
|
protocol.ServerHandler(server,
|
|
|
|
jsonrpc2.MethodNotFound)))
|
|
|
|
|
|
|
|
select {
|
|
|
|
case <-serverConn.Done():
|
|
|
|
clientConn.Close()
|
|
|
|
case <-clientConn.Done():
|
|
|
|
serverConn.Close()
|
|
|
|
}
|
2020-04-29 06:51:37 -06:00
|
|
|
|
|
|
|
err = serverConn.Err()
|
|
|
|
if err == nil {
|
|
|
|
err = clientConn.Err()
|
|
|
|
}
|
|
|
|
return err
|
2020-02-06 17:50:37 -07:00
|
|
|
}
|
2020-02-09 12:44:03 -07:00
|
|
|
|
2020-02-18 10:47:19 -07:00
|
|
|
func (f *Forwarder) connectToRemote(ctx context.Context) (net.Conn, error) {
|
|
|
|
var (
|
|
|
|
netConn net.Conn
|
|
|
|
err error
|
|
|
|
network, address = f.network, f.addr
|
|
|
|
)
|
|
|
|
if f.network == AutoNetwork {
|
|
|
|
// f.network is overloaded to support a concept of 'automatic' addresses,
|
|
|
|
// which signals that the gopls remote address should be automatically
|
|
|
|
// derived.
|
|
|
|
// So we need to resolve a real network and address here.
|
|
|
|
network, address = autoNetworkAddress(f.goplsPath, f.addr)
|
|
|
|
}
|
2020-03-05 15:54:57 -07:00
|
|
|
// Attempt to verify that we own the remote. This is imperfect, but if we can
|
|
|
|
// determine that the remote is owned by a different user, we should fail.
|
|
|
|
ok, err := verifyRemoteOwnership(network, address)
|
|
|
|
if err != nil {
|
|
|
|
// If the ownership check itself failed, we fail open but log an error to
|
|
|
|
// the user.
|
2020-05-04 13:12:06 -06:00
|
|
|
event.Error(ctx, "unable to check daemon socket owner, failing open", err)
|
2020-03-05 15:54:57 -07:00
|
|
|
} else if !ok {
|
|
|
|
// We succesfully checked that the socket is not owned by us, we fail
|
|
|
|
// closed.
|
|
|
|
return nil, fmt.Errorf("socket %q is owned by a different user", address)
|
|
|
|
}
|
2020-02-18 10:47:19 -07:00
|
|
|
// Try dialing our remote once, in case it is already running.
|
|
|
|
netConn, err = net.DialTimeout(network, address, f.dialTimeout)
|
|
|
|
if err == nil {
|
|
|
|
return netConn, nil
|
|
|
|
}
|
|
|
|
// If our remote is on the 'auto' network, start it if it doesn't exist.
|
|
|
|
if f.network == AutoNetwork {
|
|
|
|
if f.goplsPath == "" {
|
|
|
|
return nil, fmt.Errorf("cannot auto-start remote: gopls path is unknown")
|
|
|
|
}
|
|
|
|
if network == "unix" {
|
|
|
|
// Sometimes the socketfile isn't properly cleaned up when gopls shuts
|
|
|
|
// down. Since we have already tried and failed to dial this address, it
|
|
|
|
// should *usually* be safe to remove the socket before binding to the
|
|
|
|
// address.
|
|
|
|
// TODO(rfindley): there is probably a race here if multiple gopls
|
|
|
|
// instances are simultaneously starting up.
|
|
|
|
if _, err := os.Stat(address); err == nil {
|
|
|
|
if err := os.Remove(address); err != nil {
|
2020-05-01 08:05:39 -06:00
|
|
|
return nil, fmt.Errorf("removing remote socket file: %w", err)
|
2020-02-18 10:47:19 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2020-02-26 14:22:54 -07:00
|
|
|
args := []string{"serve",
|
|
|
|
"-listen", fmt.Sprintf(`%s;%s`, network, address),
|
2020-03-09 11:22:56 -06:00
|
|
|
"-listen.timeout", f.remoteListenTimeout.String(),
|
|
|
|
"-logfile", f.remoteLogfile,
|
|
|
|
}
|
|
|
|
if f.remoteDebug != "" {
|
|
|
|
args = append(args, "-debug", f.remoteDebug)
|
2020-02-26 14:22:54 -07:00
|
|
|
}
|
|
|
|
if err := startRemote(f.goplsPath, args...); err != nil {
|
2020-05-01 08:05:39 -06:00
|
|
|
return nil, fmt.Errorf("startRemote(%q, %v): %w", f.goplsPath, args, err)
|
2020-02-18 10:47:19 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// It can take some time for the newly started server to bind to our address,
|
|
|
|
// so we retry for a bit.
|
|
|
|
for retry := 0; retry < f.retries; retry++ {
|
|
|
|
startDial := time.Now()
|
|
|
|
netConn, err = net.DialTimeout(network, address, f.dialTimeout)
|
|
|
|
if err == nil {
|
|
|
|
return netConn, nil
|
|
|
|
}
|
2020-04-20 10:14:12 -06:00
|
|
|
event.Log(ctx, fmt.Sprintf("failed attempt #%d to connect to remote: %v\n", retry+2, err))
|
2020-02-18 10:47:19 -07:00
|
|
|
// In case our failure was a fast-failure, ensure we wait at least
|
|
|
|
// f.dialTimeout before trying again.
|
|
|
|
if retry != f.retries-1 {
|
|
|
|
time.Sleep(f.dialTimeout - time.Since(startDial))
|
|
|
|
}
|
|
|
|
}
|
2020-05-01 08:05:39 -06:00
|
|
|
return nil, fmt.Errorf("dialing remote: %w", err)
|
2020-02-18 10:47:19 -07:00
|
|
|
}
|
|
|
|
|
2020-03-06 08:02:36 -07:00
|
|
|
// A handshakeRequest identifies a client to the LSP server.
|
2020-02-19 08:18:21 -07:00
|
|
|
type handshakeRequest struct {
|
2020-03-06 08:02:36 -07:00
|
|
|
// ServerID is the ID of the server on the client. This should usually be 0.
|
|
|
|
ServerID string `json:"serverID"`
|
|
|
|
// Logfile is the location of the clients log file.
|
|
|
|
Logfile string `json:"logfile"`
|
|
|
|
// DebugAddr is the client debug address.
|
2020-02-19 08:18:21 -07:00
|
|
|
DebugAddr string `json:"debugAddr"`
|
2020-03-06 08:02:36 -07:00
|
|
|
// GoplsPath is the path to the Gopls binary running the current client
|
|
|
|
// process.
|
2020-02-18 10:47:19 -07:00
|
|
|
GoplsPath string `json:"goplsPath"`
|
2020-02-19 08:18:21 -07:00
|
|
|
}
|
|
|
|
|
2020-03-06 08:02:36 -07:00
|
|
|
// A handshakeResponse is returned by the LSP server to tell the LSP client
|
|
|
|
// information about its session.
|
2020-02-19 08:18:21 -07:00
|
|
|
type handshakeResponse struct {
|
2020-03-06 08:02:36 -07:00
|
|
|
// ClientID is the ID of the client as seen on the server.
|
|
|
|
ClientID string `json:"clientID"`
|
|
|
|
// SessionID is the server session associated with the client.
|
|
|
|
SessionID string `json:"sessionID"`
|
|
|
|
// Logfile is the location of the server logs.
|
|
|
|
Logfile string `json:"logfile"`
|
|
|
|
// DebugAddr is the server debug address.
|
|
|
|
DebugAddr string `json:"debugAddr"`
|
|
|
|
// GoplsPath is the path to the Gopls binary running the current server
|
|
|
|
// process.
|
|
|
|
GoplsPath string `json:"goplsPath"`
|
|
|
|
}
|
|
|
|
|
|
|
|
// ClientSession identifies a current client LSP session on the server. Note
|
|
|
|
// that it looks similar to handshakeResposne, but in fact 'Logfile' and
|
|
|
|
// 'DebugAddr' now refer to the client.
|
|
|
|
type ClientSession struct {
|
2020-02-19 08:18:21 -07:00
|
|
|
ClientID string `json:"clientID"`
|
|
|
|
SessionID string `json:"sessionID"`
|
|
|
|
Logfile string `json:"logfile"`
|
|
|
|
DebugAddr string `json:"debugAddr"`
|
|
|
|
}
|
|
|
|
|
2020-03-06 08:02:36 -07:00
|
|
|
// ServerState holds information about the gopls daemon process, including its
|
|
|
|
// debug information and debug information of all of its current connected
|
|
|
|
// clients.
|
|
|
|
type ServerState struct {
|
|
|
|
Logfile string `json:"logfile"`
|
|
|
|
DebugAddr string `json:"debugAddr"`
|
|
|
|
GoplsPath string `json:"goplsPath"`
|
|
|
|
CurrentClientID string `json:"currentClientID"`
|
|
|
|
Clients []ClientSession `json:"clients"`
|
|
|
|
}
|
|
|
|
|
|
|
|
const (
|
|
|
|
handshakeMethod = "gopls/handshake"
|
|
|
|
sessionsMethod = "gopls/sessions"
|
|
|
|
)
|
2020-02-19 08:18:21 -07:00
|
|
|
|
2020-03-30 15:09:42 -06:00
|
|
|
func handshaker(client *debugClient, goplsPath string, handler jsonrpc2.Handler) jsonrpc2.Handler {
|
2020-04-12 20:47:10 -06:00
|
|
|
return func(ctx context.Context, reply jsonrpc2.Replier, r jsonrpc2.Request) error {
|
|
|
|
switch r.Method() {
|
2020-03-30 15:09:42 -06:00
|
|
|
case handshakeMethod:
|
|
|
|
var req handshakeRequest
|
2020-04-12 20:47:10 -06:00
|
|
|
if err := json.Unmarshal(r.Params(), &req); err != nil {
|
|
|
|
sendError(ctx, reply, err)
|
2020-03-30 15:09:42 -06:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
client.debugAddress = req.DebugAddr
|
|
|
|
client.logfile = req.Logfile
|
|
|
|
client.serverID = req.ServerID
|
|
|
|
client.goplsPath = req.GoplsPath
|
|
|
|
resp := handshakeResponse{
|
|
|
|
ClientID: client.id,
|
|
|
|
SessionID: cache.DebugSession{Session: client.session}.ID(),
|
|
|
|
GoplsPath: goplsPath,
|
|
|
|
}
|
|
|
|
if di := debug.GetInstance(ctx); di != nil {
|
|
|
|
resp.Logfile = di.Logfile
|
|
|
|
resp.DebugAddr = di.ListenedDebugAddress
|
|
|
|
}
|
2020-02-28 08:30:03 -07:00
|
|
|
|
2020-04-09 21:54:23 -06:00
|
|
|
return reply(ctx, resp, nil)
|
2020-03-30 15:09:42 -06:00
|
|
|
case sessionsMethod:
|
|
|
|
resp := ServerState{
|
|
|
|
GoplsPath: goplsPath,
|
|
|
|
CurrentClientID: client.ID(),
|
|
|
|
}
|
|
|
|
if di := debug.GetInstance(ctx); di != nil {
|
|
|
|
resp.Logfile = di.Logfile
|
|
|
|
resp.DebugAddr = di.ListenedDebugAddress
|
|
|
|
for _, c := range di.State.Clients() {
|
|
|
|
resp.Clients = append(resp.Clients, ClientSession{
|
|
|
|
ClientID: c.ID(),
|
|
|
|
SessionID: c.Session().ID(),
|
|
|
|
Logfile: c.Logfile(),
|
|
|
|
DebugAddr: c.DebugAddress(),
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
2020-04-09 21:54:23 -06:00
|
|
|
return reply(ctx, resp, nil)
|
2020-03-06 08:02:36 -07:00
|
|
|
}
|
2020-04-09 21:54:23 -06:00
|
|
|
return handler(ctx, reply, r)
|
2020-02-19 08:18:21 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-04-12 20:47:10 -06:00
|
|
|
func sendError(ctx context.Context, reply jsonrpc2.Replier, err error) {
|
2020-04-09 21:00:00 -06:00
|
|
|
err = fmt.Errorf("%w: %v", jsonrpc2.ErrParse, err)
|
2020-04-09 21:54:23 -06:00
|
|
|
if err := reply(ctx, nil, err); err != nil {
|
2020-03-07 19:28:21 -07:00
|
|
|
event.Error(ctx, "", err)
|
2020-02-19 08:18:21 -07:00
|
|
|
}
|
|
|
|
}
|