feat(config): add retry and waitcapture property
This commit is contained in:
parent
3d087de12e
commit
2623502cc8
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
|
@ -0,0 +1 @@
|
||||||
|
debug.test
|
45
client.go
45
client.go
|
@ -9,6 +9,7 @@ import (
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/url"
|
"net/url"
|
||||||
"os"
|
"os"
|
||||||
|
"strconv"
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
@ -54,12 +55,36 @@ type Client struct {
|
||||||
type Label struct {
|
type Label struct {
|
||||||
label string
|
label string
|
||||||
|
|
||||||
conditionJS string
|
conditionJS string
|
||||||
conditionlock sync.Mutex
|
retry string
|
||||||
|
waitcapture string
|
||||||
|
configlock sync.Mutex
|
||||||
|
|
||||||
cli *Client
|
cli *Client
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetWaitime Get return waitime int
|
||||||
|
func (l *Label) GetWaitime() int {
|
||||||
|
r, _ := strconv.Atoi(l.waitcapture)
|
||||||
|
return r
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetWaitime Set waitime int
|
||||||
|
func (l *Label) SetWaitime(waitime int) {
|
||||||
|
l.waitcapture = strconv.Itoa(waitime)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetRetry Get return retry int
|
||||||
|
func (l *Label) GetRetry() int {
|
||||||
|
r, _ := strconv.Atoi(l.retry)
|
||||||
|
return r
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetRetry Set retry int
|
||||||
|
func (l *Label) SetRetry(retry int) {
|
||||||
|
l.retry = strconv.Itoa(retry)
|
||||||
|
}
|
||||||
|
|
||||||
// GetHash 根据label获取hash路径
|
// GetHash 根据label获取hash路径
|
||||||
func (l *Label) GetHash(label string) string {
|
func (l *Label) GetHash(label string) string {
|
||||||
if cb, ok := l.cli.register.Load(label); ok {
|
if cb, ok := l.cli.register.Load(label); ok {
|
||||||
|
@ -83,8 +108,8 @@ func (l *Label) Open(urlstr string, carray interface{}) (bodyRes string, ok bool
|
||||||
|
|
||||||
// SetContentCondition 设置识别到的内容条件. js代码. 必须是一个函数. 命名可以随意. 返回bool
|
// SetContentCondition 设置识别到的内容条件. js代码. 必须是一个函数. 命名可以随意. 返回bool
|
||||||
func (l *Label) SetContentCondition(jsScript string) {
|
func (l *Label) SetContentCondition(jsScript string) {
|
||||||
l.conditionlock.Lock()
|
l.configlock.Lock()
|
||||||
defer l.conditionlock.Unlock()
|
defer l.configlock.Unlock()
|
||||||
l.conditionJS = jsScript
|
l.conditionJS = jsScript
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -98,8 +123,8 @@ func (l *Label) SetContentConditionFromFile(jsScriptFile string) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
l.conditionlock.Lock()
|
l.configlock.Lock()
|
||||||
defer l.conditionlock.Unlock()
|
defer l.configlock.Unlock()
|
||||||
// log.Println(string(data))
|
// log.Println(string(data))
|
||||||
l.conditionJS = string(data)
|
l.conditionJS = string(data)
|
||||||
}
|
}
|
||||||
|
@ -132,7 +157,7 @@ func (cli *Client) Register(label string, callback func(cxt *CallbackContext)) *
|
||||||
}
|
}
|
||||||
cli.register.Store(label, cb)
|
cli.register.Store(label, cb)
|
||||||
cli.register.Store(cb.hash, cb)
|
cli.register.Store(cb.hash, cb)
|
||||||
l := &Label{label: label, cli: cli}
|
l := &Label{label: label, cli: cli, waitcapture: "6000", retry: "1"}
|
||||||
return l
|
return l
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -239,9 +264,11 @@ func (cli *Client) open(label *Label, urlstr string, carray interface{}) (bodyRe
|
||||||
}
|
}
|
||||||
|
|
||||||
func() {
|
func() {
|
||||||
label.conditionlock.Lock()
|
label.configlock.Lock()
|
||||||
defer label.conditionlock.Unlock()
|
defer label.configlock.Unlock()
|
||||||
data["content_condition"] = []string{label.conditionJS}
|
data["content_condition"] = []string{label.conditionJS}
|
||||||
|
data["waitcapture"] = []string{label.waitcapture}
|
||||||
|
data["retry"] = []string{label.retry}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
resp, err := http.DefaultClient.PostForm(cli.chromeProxyAddr+"/task/put", data)
|
resp, err := http.DefaultClient.PostForm(cli.chromeProxyAddr+"/task/put", data)
|
||||||
|
|
|
@ -20,7 +20,7 @@ func TestPort(t *testing.T) {
|
||||||
|
|
||||||
ltest.SetContentConditionFromFile("example.js")
|
ltest.SetContentConditionFromFile("example.js")
|
||||||
cli.Connect()
|
cli.Connect()
|
||||||
// log.Println(ltest.Open("https://playerduo.com/api/playerDuo-service-v2/rip113?lang=en&deviceType=browser", nil))
|
log.Println(ltest.Open("https://playerduo.com/api/playerDuo-service-v2/rip113?lang=en&deviceType=browser", nil))
|
||||||
// log.Println(ltest.Open("https://playerduo.com/api/playerDuo-service-v2/yanngu?lang=en&deviceType=browser", "213"))
|
// log.Println(ltest.Open("https://playerduo.com/api/playerDuo-service-v2/yanngu?lang=en&deviceType=browser", "213"))
|
||||||
// log.Println(ltest.Open("https://playerduo.com/api/playerDuo-service-v2/rip113?lang=en&deviceType=browser"))
|
// log.Println(ltest.Open("https://playerduo.com/api/playerDuo-service-v2/rip113?lang=en&deviceType=browser"))
|
||||||
// log.Println(ltest.Open("https://playerduo.com/api/playerDuo-service-v2/yanngu?lang=en&deviceType=browser"))
|
// log.Println(ltest.Open("https://playerduo.com/api/playerDuo-service-v2/yanngu?lang=en&deviceType=browser"))
|
||||||
|
|
Loading…
Reference in New Issue
Block a user