Skip to content

Commit ff2ccf2

Browse files
committed
fix typo && update readme
1 parent 175b040 commit ff2ccf2

File tree

3 files changed

+75
-79
lines changed

3 files changed

+75
-79
lines changed

README.md

Lines changed: 57 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -37,75 +37,67 @@ export V2SCAR_GRPC_ENDPOINT="127.0.0.1:8080" # 这个是机器上v2ray开放的g
3737
3838
```json
3939
{
40-
"stats": {},
41-
"api": {
42-
"services": [
43-
"HandlerService",
44-
"StatsService"
45-
],
46-
"tag": "api"
47-
},
48-
"policy": {
49-
"levels": {
50-
"0": {
51-
"handshake": 4,
52-
"connIdle": 300,
53-
"uplinkOnly": 2,
54-
"downlinkOnly": 5,
55-
"statsUserUplink": true,
56-
"statsUserDownlink": true,
57-
"bufferSize": 10240
58-
}
59-
},
60-
"system": {
61-
"statsInboundUplink": true,
62-
"statsInboundDownlink": true
63-
}
64-
},
65-
"inbound": {
66-
"port": 10086,
67-
"protocol": "vmess",
68-
"settings": {
69-
"clients": []
40+
"stats": {},
41+
"api": {
42+
"tag": "api",
43+
"services": [
44+
"HandlerService",
45+
"StatsService"
46+
]
7047
},
71-
"streamSettings": {
72-
"network": "tcp"
48+
"log": {
49+
"loglevel": "warning"
7350
},
74-
"tag": "proxy"
75-
},
76-
"inboundDetour": [
77-
{
78-
"listen": "127.0.0.1",
79-
"port": 8080,
80-
"protocol": "dokodemo-door",
81-
"settings": {
82-
"address": "127.0.0.1"
51+
"policy": {
52+
"levels": {
53+
"0": {
54+
"statsUserUplink": true,
55+
"statsUserDownlink": true
56+
}
57+
},
58+
"system": {
59+
"statsInboundUplink": true,
60+
"statsInboundDownlink": true
61+
}
8362
},
84-
"tag": "api"
85-
}
86-
],
87-
"log": {
88-
"loglevel": "warning",
89-
"access": "/var/log/v2ray/access.log",
90-
"error": "/var/log/v2ray/error.log"
91-
},
92-
"outbound": {
93-
"protocol": "freedom",
94-
"settings": {}
95-
},
96-
"routing": {
97-
"settings": {
98-
"rules": [
63+
"inbounds": [
64+
{
65+
"tag": "proxy",
66+
"port": 10086,
67+
"protocol": "vmess",
68+
"settings": {
69+
"clients": []
70+
}
71+
},
9972
{
100-
"inboundTag": [
101-
"api"
102-
],
103-
"outboundTag": "api",
104-
"type": "field"
73+
"listen": "127.0.0.1",
74+
"port": 8080,
75+
"protocol": "dokodemo-door",
76+
"settings": {
77+
"address": "127.0.0.1"
78+
},
79+
"tag": "api"
10580
}
106-
]
107-
},
108-
"strategy": "rules"
109-
}
81+
],
82+
"outbounds": [
83+
{
84+
"protocol": "freedom",
85+
"settings": {}
86+
}
87+
],
88+
"routing": {
89+
"settings": {
90+
"rules": [
91+
{
92+
"inboundTag": [
93+
"api"
94+
],
95+
"outboundTag": "api",
96+
"type": "field"
97+
}
98+
]
99+
},
100+
"strategy": "rules"
101+
}
110102
}
111103
```

cli/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ func main() {
1717
app := cli.NewApp()
1818
app.Name = "v2scar"
1919
app.Usage = "sidecar for V2ray"
20-
app.Version = "0.0.2"
20+
app.Version = "0.0.3"
2121
app.Author = "Ehco1996"
2222

2323
app.Flags = []cli.Flag{
2424
cli.StringFlag{
2525
Name: "grpc-endpoint, gp",
26-
Value: "127.0.0.0.1:8080",
26+
Value: "127.0.0.1:8080",
2727
Usage: "V2ray开放的GRPC地址",
2828
EnvVar: "V2SCAR_GRPC_ENDPOINT",
2929
Destination: &v2scar.GRPC_ENDPOINT,

services.go

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,22 @@ func GetAndResetUserTraffic(c v2stats.StatsServiceClient, up *UserPool) {
2121
Pattern: "user>>>",
2222
Reset_: true,
2323
}
24-
resp, _ := c.QueryStats(context.Background(), req)
25-
for _, stat := range resp.Stat {
26-
email, trafficType := getEmailAndTrafficType(stat.Name)
27-
user, err := up.GetUserByEmail(email)
28-
if err != nil {
29-
log.Println(err)
30-
} else {
31-
switch trafficType {
32-
case "uplink":
33-
user.setUploadTraffic(stat.Value)
34-
case "downlink":
35-
user.setDownloadTraffic(stat.Value)
24+
resp, err := c.QueryStats(context.Background(), req)
25+
if err != nil {
26+
log.Println("[ERROR]:", err)
27+
} else {
28+
for _, stat := range resp.Stat {
29+
email, trafficType := getEmailAndTrafficType(stat.Name)
30+
user, err := up.GetUserByEmail(email)
31+
if err != nil {
32+
log.Println(err)
33+
} else {
34+
switch trafficType {
35+
case "uplink":
36+
user.setUploadTraffic(stat.Value)
37+
case "downlink":
38+
user.setDownloadTraffic(stat.Value)
39+
}
3640
}
3741
}
3842
}

0 commit comments

Comments
 (0)