Alex-Devera/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2025-04-19 13:32:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

warp - optimize utility code

Browse source
This commit is contained in:
mhsanaei 2025-03-12 19:24:39 +01:00
parent 315d852087
commit 280a22b57d
No known key found for this signature in database
GPG key ID: D875CD086CF668A0
2 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
web/html/xui/warp_modal.html
View file

@ -176,10 +176,10 @@
}, },
async register() { async register() {
warpModal.loading(true); warpModal.loading(true);
keys = Wireguard.generateKeypair(); const keys = Wireguard.generateKeypair();
const msg = await HttpUtil.post('/panel/xray/warp/reg', keys); const msg = await HttpUtil.post('/panel/xray/warp/reg', keys);
if (msg.success) { if (msg.success) {
resp = JSON.parse(msg.obj); const resp = JSON.parse(msg.obj);
warpModal.warpData = resp.data; warpModal.warpData = resp.data;
warpModal.warpConfig = resp.config; warpModal.warpConfig = resp.config;
this.collectConfig(); this.collectConfig();

19
web/service/warp.go
View file

@ -56,8 +56,7 @@ func (s *WarpService) GetWarpConfig() (string, error) {
return "", err return "", err
} }
defer resp.Body.Close() defer resp.Body.Close()
buffer := bytes.NewBuffer(make([]byte, 8192)) buffer := &bytes.Buffer{}
buffer.Reset()
_, err = buffer.ReadFrom(resp.Body) _, err = buffer.ReadFrom(resp.Body)
if err != nil { if err != nil {
return "", err return "", err
@ -87,14 +86,13 @@ func (s *WarpService) RegWarp(secretKey string, publicKey string) (string, error
return "", err return "", err
} }
defer resp.Body.Close() defer resp.Body.Close()
buffer := bytes.NewBuffer(make([]byte, 8192)) buffer := &bytes.Buffer{}
buffer.Reset()
_, err = buffer.ReadFrom(resp.Body) _, err = buffer.ReadFrom(resp.Body)
if err != nil { if err != nil {
return "", err return "", err
} }
var rspData map[string]interface{} var rspData map[string]any
err = json.Unmarshal(buffer.Bytes(), &rspData) err = json.Unmarshal(buffer.Bytes(), &rspData)
if err != nil { if err != nil {
return "", err return "", err
@ -102,7 +100,7 @@ func (s *WarpService) RegWarp(secretKey string, publicKey string) (string, error
deviceId := rspData["id"].(string) deviceId := rspData["id"].(string)
token := rspData["token"].(string) token := rspData["token"].(string)
license, ok := rspData["account"].(map[string]interface{})["license"].(string) license, ok := rspData["account"].(map[string]any)["license"].(string)
if !ok { if !ok {
logger.Debug("Error accessing license value.") logger.Debug("Error accessing license value.")
return "", err return "", err
@ -144,21 +142,20 @@ func (s *WarpService) SetWarpLicense(license string) (string, error) {
return "", err return "", err
} }
defer resp.Body.Close() defer resp.Body.Close()
buffer := bytes.NewBuffer(make([]byte, 8192)) buffer := &bytes.Buffer{}
buffer.Reset()
_, err = buffer.ReadFrom(resp.Body) _, err = buffer.ReadFrom(resp.Body)
if err != nil { if err != nil {
return "", err return "", err
} }
var response map[string]interface{} var response map[string]any
err = json.Unmarshal(buffer.Bytes(), &response) err = json.Unmarshal(buffer.Bytes(), &response)
if err != nil { if err != nil {
return "", err return "", err
} }
if response["success"] == false { if response["success"] == false {
errorArr, _ := response["errors"].([]interface{}) errorArr, _ := response["errors"].([]any)
errorObj := errorArr[0].(map[string]interface{}) errorObj := errorArr[0].(map[string]any)
return "", common.NewError(errorObj["code"], errorObj["message"]) return "", common.NewError(errorObj["code"], errorObj["message"])
} }