Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ftr: Add dubbo-go-cli telnet tool support #818

Merged
merged 32 commits into from
Feb 3, 2021
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
3b9229b
ftr: add cli tool
LaurenceLiZhixin Oct 26, 2020
16baeda
fix: add readme
LaurenceLiZhixin Oct 26, 2020
63ae531
fix: change go import
LaurenceLiZhixin Oct 29, 2020
b99152a
fix: fix import block
LaurenceLiZhixin Oct 29, 2020
4f2d462
fix: add lisence
LaurenceLiZhixin Oct 30, 2020
6d5a472
chore: add all license
LaurenceLiZhixin Oct 30, 2020
841c4e6
fix: change comment to English
LaurenceLiZhixin Oct 30, 2020
0008fa9
chore: retry cicd
LaurenceLiZhixin Oct 31, 2020
4fe1da9
fix: add enEnglish readme, add timeout param
LaurenceLiZhixin Nov 7, 2020
54d4984
fix: change hessian register method
LaurenceLiZhixin Nov 20, 2020
7b7b8a5
fix: use vv.Type to check POJO
LaurenceLiZhixin Nov 20, 2020
34e0999
chore
LaurenceLiZhixin Nov 24, 2020
8f7fc94
chore: comment fix
LaurenceLiZhixin Nov 26, 2020
62ec58a
Fix: change hessian pkg
LaurenceLiZhixin Nov 27, 2020
b41de25
fix
Dec 4, 2020
aebfe94
fix: change rely repository to dubbogo/gost
Dec 9, 2020
11fd33b
fix: fix merge conflict
Dec 9, 2020
1599fd4
fix: change hessian2 version to 1.8.0
Dec 9, 2020
d4ce11b
fix: change gost to 1.10
Dec 11, 2020
53db19c
fix: change gost version to 1.10
Dec 11, 2020
07754c0
fix: change cli gost version to 1.10.0
Dec 11, 2020
b6022bb
fix ctx linter error
AlexStocks Jan 4, 2021
d305b67
Merge remote-tracking branch 'upstream/develop' into develop
LaurenceLiZhixin Jan 10, 2021
93168df
fix: fix conflict
LaurenceLiZhixin Jan 10, 2021
34289f4
Fix: go fmt
LaurenceLiZhixin Jan 10, 2021
1ab564f
fix: go mod tidy
LaurenceLiZhixin Jan 10, 2021
5919b11
Merge remote-tracking branch 'upstream/develop' into develop
LaurenceLiZhixin Jan 13, 2021
3dc2f17
Merge remote-tracking branch 'upstream/develop' into develop
LaurenceLiZhixin Jan 17, 2021
55737aa
Merge remote-tracking branch 'upstream/develop' into develop
LaurenceLiZhixin Jan 22, 2021
65cd856
Merge remote-tracking branch 'upstream/develop' into develop
LaurenceLiZhixin Jan 26, 2021
f3ef409
Merge branch 'develop' into feature/cli-support
LaurenceLiZhixin Jan 26, 2021
18ab1c4
fix: add comment
LaurenceLiZhixin Feb 2, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions tools/cli/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
.idea/


# Binary
example/dubbo-go-cli

18 changes: 18 additions & 0 deletions tools/cli/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# dubbo-go-cli

### 1. 解决问题
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hey, guy, pls using English in an Apache project. Or u rename this file to readme_cn.md and add an English readme.


针对正在运行的dubbo服务,需要拥有一个命令行工具来针对服务进行测试。
该服务需要支持dubbo协议,方便用户进行自定义传输包体。

### 2. cli工具获取方法
`sh build.sh`

### 3. 使用方法:见[example](./example/README.md)



### 第三方依赖(临时兼容)

github.com/LaurenceLiZhixin/dubbo-go-hessian2 \
github.com/LaurenceLiZhixin/json-interface-parser
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pls submit ur code to github.com/dubbogo/gost.

2 changes: 2 additions & 0 deletions tools/cli/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export GOPROXY="http://goproxy.io"
go build -o dubbo-go-cli
200 changes: 200 additions & 0 deletions tools/cli/client/client.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,200 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package client

import (
"bytes"
"fmt"
"log"
"net"
"sync"
"time"
)

import (
"go.uber.org/atomic"
)

import (
"github.com/apache/dubbo-go/tools/cli/common"
"github.com/apache/dubbo-go/tools/cli/protocol"
_ "github.com/apache/dubbo-go/tools/cli/protocol/dubbo"
)

const defaultBufferSize = 4096

// TelnetClient maintain a connection to target
type TelnetClient struct {
responseTimeout time.Duration
protocolName string
requestList []*protocol.Request
conn *net.TCPConn
proto protocol.Protocol

sequence atomic.Uint64
pendingResponses *sync.Map
waitNum atomic.Uint64
}

// NewTelnetClient create a new tcp connection, and create default request
func NewTelnetClient(host string, port int, protocolName, interfaceID, version, group, method string, reqPkg interface{}) (*TelnetClient, error) {
tcpAddr := createTCPAddr(host, port)
resolved := resolveTCPAddr(tcpAddr)
conn, err := net.DialTCP("tcp", nil, resolved)
if err != nil {
return nil, err
}
log.Printf("connected to %s:%d!\n", host, port)
log.Printf("try calling interface:%s.%s\n", interfaceID, method)
log.Printf("with protocol:%s\n\n", protocolName)
proto := common.GetProtocol(protocolName)

return &TelnetClient{
conn: conn,
responseTimeout: 100000000, //default timeout
protocolName: protocolName,
pendingResponses: &sync.Map{},
proto: proto,
requestList: []*protocol.Request{
{
InterfaceID: interfaceID,
Version: version,
Method: method,
Group: group,
Params: []interface{}{reqPkg},
},
},
}, nil
}

func createTCPAddr(host string, port int) string {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pls using net.JoinHostPort instead.

var buffer bytes.Buffer
buffer.WriteString(host)
buffer.WriteByte(':')
buffer.WriteString(fmt.Sprintf("%d", port))
return buffer.String()
}

func resolveTCPAddr(addr string) *net.TCPAddr {
resolved, error := net.ResolveTCPAddr("tcp", addr)
if nil != error {
log.Fatalf("Error occured while resolving TCP address \"%v\": %v\n", addr, error)
}

return resolved
}

// ProcessRequests send all requests
func (t *TelnetClient) ProcessRequests(userPkg interface{}) {
for i, _ := range t.requestList {
t.processSingleRequest(t.requestList[i], userPkg)
}
}

// addPendingResponse add a response @model to pending queue
// once the rsp got, the model will be used.
func (t *TelnetClient) addPendingResponse(model interface{}) uint64 {
seqId := t.sequence.Load()
t.pendingResponses.Store(seqId, model)
t.waitNum.Inc()
t.sequence.Inc()
return seqId
}

// removePendingResponse delete item from pending queue by @seq
func (t *TelnetClient) removePendingResponse(seq uint64) {
if t.pendingResponses == nil {
return
}
if _, ok := t.pendingResponses.Load(seq); ok {
t.pendingResponses.Delete(seq)
t.waitNum.Dec()
}
return
}

// processSingleRequest call one req.
func (t *TelnetClient) processSingleRequest(req *protocol.Request, userPkg interface{}) {
// proto create package procedure
req.ID = t.sequence.Load()
inputData, err := t.proto.Write(req)
if err != nil {
log.Fatalln("error: handler.Writer err = ", err)
}
startTime := time.Now()

// init rsp Package and add to pending queue
seqId := t.addPendingResponse(userPkg)
defer t.removePendingResponse(seqId)

requestDataChannel := make(chan []byte)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do not need to set its length for this chan?

doneChannel := make(chan bool)
responseDataChannel := make(chan []byte)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the same as above


// start data transfer procedure
go t.readInputData(string(inputData), requestDataChannel, doneChannel)
go t.readServerData(t.conn, responseDataChannel)

for {
select {
case request := <-requestDataChannel:
if _, err := t.conn.Write(request); nil != err {
log.Fatalf("Error occured while writing to TCP socket: %v\n", err)
}
case response := <-responseDataChannel:
rspPkg, _, err := t.proto.Read(response, t.pendingResponses)
if err != nil {
log.Fatalln("Error with protocol Read(): ", err)
}
t.removePendingResponse(seqId)
log.Printf("After %dms , Got Rsp:", time.Now().Sub(startTime).Milliseconds())
common.PrintInterface(rspPkg)
if t.waitNum.Sub(0) == 0 {
return
}
}
}
}

func (t *TelnetClient) readInputData(inputData string, toSent chan<- []byte, doneChannel chan<- bool) {
toSent <- []byte(inputData)
doneChannel <- true
}

func (t *TelnetClient) readServerData(connection *net.TCPConn, received chan<- []byte) {
buffer := make([]byte, defaultBufferSize)
var err error
var n int
for nil == err {
n, err = connection.Read(buffer)
received <- buffer[:n]
}

t.assertEOF(err)
}

func (t *TelnetClient) assertEOF(error error) {
if "EOF" != error.Error() {
log.Fatalf("Error occured while operating on TCP socket: %v\n", error)
}
}

// Destroy close the tcp conn
func (t *TelnetClient) Destroy() {
t.conn.Close()
}
39 changes: 39 additions & 0 deletions tools/cli/common/protocol.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package common

import (
"github.com/apache/dubbo-go/tools/cli/protocol"
)

var (
protocols = make(map[string]func() protocol.Protocol)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pls set its init length param, such as 8

)

// SetProtocol sets the protocol extension with @name
func SetProtocol(name string, v func() protocol.Protocol) {
protocols[name] = v
}

// GetProtocol finds the protocol extension with @name
func GetProtocol(name string) protocol.Protocol {
if protocols[name] == nil {
panic("protocol for " + name + " is not existing, make sure you have import the package.")
}
return protocols[name]()
}
39 changes: 39 additions & 0 deletions tools/cli/common/tool.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package common

import (
"fmt"
"log"
"reflect"
)

// PrintInterface print the interface by level
func PrintInterface(v interface{}) {
val := reflect.ValueOf(v).Elem()
typ := reflect.TypeOf(v)
log.Printf("%+v\n", v)
nums := val.NumField()
for i := 0; i < nums; i++ {
if typ.Elem().Field(i).Type.Kind() == reflect.Ptr {
log.Printf("%s: ", typ.Elem().Field(i).Name)
PrintInterface(val.Field(i).Interface())
}
}
fmt.Println("")
}
Loading