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

[lint] all .go files

Browse source
This commit is contained in:
Hamidreza Ghavami 2024-03-09 01:01:32 +03:30
parent 61c44b6291
commit 1be4335371
No known key found for this signature in database
GPG key ID: 402C6797325182D9
37 changed files with 96 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
database/model/model.go
View file

@ -2,6 +2,7 @@ package model
import (
"fmt"
"x-ui/util/json_util"
"x-ui/xray"
)

14
logger/logger.go
View file

@ -8,12 +8,14 @@ import (
"github.com/op/go-logging"
)
var logger *logging.Logger
var logBuffer []struct {
time string
level logging.Level
log string
}
var (
logger *logging.Logger
logBuffer []struct {
time string
level logging.Level
log string
}
)
func init() {
InitLogger(logging.INFO)

3
sub/sub.go
View file

@ -7,6 +7,7 @@ import (
"net"
"net/http"
"strconv"
"x-ui/config"
"x-ui/logger"
"x-ui/util/common"
@ -99,7 +100,7 @@ func (s *Server) initRouter() (*gin.Engine, error) {
}
func (s *Server) Start() (err error) {
//This is an anonymous function, no function name
// This is an anonymous function, no function name
defer func() {
if err != nil {
s.Stop()

4
sub/subController.go
View file

@ -25,8 +25,8 @@ func NewSUBController(
showInfo bool,
rModel string,
update string,
jsonFragment string) *SUBController {
jsonFragment string,
) *SUBController {
a := &SUBController{
subPath: subPath,
subJsonPath: jsonPath,

1
sub/subJsonService.go
View file

@ -5,6 +5,7 @@ import (
"encoding/json"
"fmt"
"strings"
"x-ui/database/model"
"x-ui/logger"
"x-ui/util/json_util"

1
sub/subService.go
View file

@ -6,6 +6,7 @@ import (
"net/url"
"strings"
"time"
"x-ui/database"
"x-ui/database/model"
"x-ui/logger"

1
util/common/err.go
View file

@ -3,6 +3,7 @@ package common
import (
"errors"
"fmt"
"x-ui/logger"
)

14
util/random/random.go
View file

@ -4,12 +4,14 @@ import (
"math/rand"
)
var numSeq [10]rune
var lowerSeq [26]rune
var upperSeq [26]rune
var numLowerSeq [36]rune
var numUpperSeq [36]rune
var allSeq [62]rune
var (
numSeq [10]rune
lowerSeq [26]rune
upperSeq [26]rune
numLowerSeq [36]rune
numUpperSeq [36]rune
allSeq [62]rune
)
func init() {
for i := 0; i < 10; i++ {

4
web/controller/base.go
View file

@ -2,6 +2,7 @@ package controller
import (
"net/http"
"x-ui/logger"
"x-ui/web/locale"
"x-ui/web/session"
@ -9,8 +10,7 @@ import (
"github.com/gin-gonic/gin"
)
type BaseController struct {
}
type BaseController struct{}
func (a *BaseController) checkLogin(c *gin.Context) {
if !session.IsLogin(c) {

1
web/controller/inbound.go
View file

@ -4,6 +4,7 @@ import (
"encoding/json"
"fmt"
"strconv"
"x-ui/database/model"
"x-ui/web/service"
"x-ui/web/session"

1
web/controller/index.go
View file

@ -3,6 +3,7 @@ package controller
import (
"net/http"
"time"
"x-ui/logger"
"x-ui/web/service"
"x-ui/web/session"

1
web/controller/server.go
View file

@ -5,6 +5,7 @@ import (
"net/http"
"regexp"
"time"
"x-ui/web/global"
"x-ui/web/service"

1
web/controller/setting.go
View file

@ -3,6 +3,7 @@ package controller
import (
"errors"
"time"
"x-ui/web/entity"
"x-ui/web/service"
"x-ui/web/session"

1
web/controller/util.go
View file

@ -4,6 +4,7 @@ import (
"net"
"net/http"
"strings"
"x-ui/config"
"x-ui/logger"
"x-ui/web/entity"

1
web/entity/entity.go
View file

@ -5,6 +5,7 @@ import (
"net"
"strings"
"time"
"x-ui/util/common"
)

6
web/global/global.go
View file

@ -7,8 +7,10 @@ import (
"github.com/robfig/cron/v3"
)
var webServer WebServer
var subServer SubServer
var (
webServer WebServer
subServer SubServer
)
type WebServer interface {
GetCron() *cron.Cron

1
web/job/check_cpu_usage.go
View file

@ -3,6 +3,7 @@ package job
import (
"strconv"
"time"
"x-ui/web/service"
"github.com/shirou/gopsutil/v3/cpu"

2
web/job/check_xray_running_job.go
View file

@ -20,7 +20,7 @@ func (j *CheckXrayRunningJob) Run() {
j.checkTime = 0
} else {
j.checkTime++
//only restart if it's down 2 times in a row
// only restart if it's down 2 times in a row
if j.checkTime > 1 {
err := j.xrayService.RestartXray(false)
j.checkTime = 0

5
web/job/clear_logs_job.go
View file

@ -3,6 +3,7 @@ package job
import (
"io"
"os"
"x-ui/logger"
"x-ui/xray"
)
@ -17,7 +18,7 @@ func NewClearLogsJob() *ClearLogsJob {
func (j *ClearLogsJob) Run() {
logFiles := []string{xray.GetIPLimitLogPath(), xray.GetIPLimitBannedLogPath(), xray.GetAccessPersistentLogPath()}
logFilesPrev := []string{xray.GetIPLimitBannedPrevLogPath(), xray.GetAccessPersistentPrevLogPath()}
// clear old previous logs
for i := 0; i < len(logFilesPrev); i++ {
if err := os.Truncate(logFilesPrev[i], 0); err != nil {
@ -43,7 +44,7 @@ func (j *ClearLogsJob) Run() {
if err != nil {
logger.Warning("clear logs job err:", err)
}
logFile.Close()
logFilePrev.Close()
}

1
web/job/xray_traffic_job.go
View file

@ -36,5 +36,4 @@ func (j *XrayTrafficJob) Run() {
if needRestart0 || needRestart1 {
j.xrayService.SetToNeedRestart()
}
}

11
web/locale/locale.go
View file

@ -4,6 +4,7 @@ import (
"embed"
"io/fs"
"strings"
"x-ui/logger"
"github.com/gin-gonic/gin"
@ -12,9 +13,11 @@ import (
"golang.org/x/text/language"
)
var i18nBundle *i18n.Bundle
var LocalizerWeb *i18n.Localizer
var LocalizerBot *i18n.Localizer
var (
i18nBundle *i18n.Bundle
LocalizerWeb *i18n.Localizer
LocalizerBot *i18n.Localizer
)
type I18nType string
@ -79,7 +82,6 @@ func I18n(i18nType I18nType, key string, params ...string) string {
MessageID: key,
TemplateData: templateData,
})
if err != nil {
logger.Errorf("Failed to localize message: %v", err)
return ""
@ -135,7 +137,6 @@ func parseTranslationFiles(i18nFS embed.FS, i18nBundle *i18n.Bundle) error {
_, err = i18nBundle.ParseMessageFileBytes(data, path)
return err
})
if err != nil {
return err
}

8
web/service/inbound.go
View file

@ -5,6 +5,7 @@ import (
"fmt"
"strings"
"time"
"x-ui/database"
"x-ui/database/model"
"x-ui/logger"
@ -90,7 +91,6 @@ func (s *InboundService) getAllEmails() ([]string, error) {
FROM inbounds,
JSON_EACH(JSON_EXTRACT(inbounds.settings, '$.clients')) AS client
`).Scan(&emails).Error
if err != nil {
return nil, err
}
@ -1074,7 +1074,9 @@ func (s *InboundService) UpdateClientStat(tx *gorm.DB, email string, client *mod
"email": client.Email,
"total": client.TotalGB,
"expiry_time": client.ExpiryTime,
"reset": client.Reset})
"reset": client.Reset,
})
err := result.Error
if err != nil {
return err
@ -1573,7 +1575,6 @@ func (s *InboundService) ResetAllClientTraffics(id int) error {
Updates(map[string]interface{}{"enable": true, "up": 0, "down": 0})
err := result.Error
if err != nil {
return err
}
@ -1588,7 +1589,6 @@ func (s *InboundService) ResetAllTraffics() error {
Updates(map[string]interface{}{"up": 0, "down": 0})
err := result.Error
if err != nil {
return err
}

3
web/service/outbound.go
View file

@ -9,8 +9,7 @@ import (
"gorm.io/gorm"
)
type OutboundService struct {
}
type OutboundService struct{}
func (s *OutboundService) AddTraffic(traffics []*xray.Traffic, clientTraffics []*xray.ClientTraffic) (error, bool) {
var err error

4
web/service/panel.go
View file

@ -4,11 +4,11 @@ import (
"os"
"syscall"
"time"
"x-ui/logger"
)
type PanelService struct {
}
type PanelService struct{}
func (s *PanelService) RestartPanel(delay time.Duration) error {
p, err := os.FindProcess(syscall.Getpid())

1
web/service/server.go
View file

@ -382,7 +382,6 @@ func (s *ServerService) UpdateXray(version string) error {
}
return nil
}
func (s *ServerService) GetLogs(count string, level string, syslog string) []string {

5
web/service/setting.go
View file

@ -9,6 +9,7 @@ import (
"strconv"
"strings"
"time"
"x-ui/database"
"x-ui/database/model"
"x-ui/logger"
@ -64,8 +65,7 @@ var defaultValueMap = map[string]string{
"warp": "",
}
type SettingService struct {
}
type SettingService struct{}
func (s *SettingService) GetDefaultJsonConfig() (interface{}, error) {
var jsonData interface{}
@ -444,6 +444,7 @@ func (s *SettingService) GetDatepicker() (string, error) {
func (s *SettingService) GetWarp() (string, error) {
return s.getString("warp")
}
func (s *SettingService) SetWarp(data string) error {
return s.setString("warp", data)
}

31
web/service/tgbot.go
View file

@ -10,6 +10,7 @@ import (
"strconv"
"strings"
"time"
"x-ui/config"
"x-ui/database"
"x-ui/database/model"
@ -26,12 +27,14 @@ import (
"github.com/valyala/fasthttp/fasthttpproxy"
)
var bot *telego.Bot
var botHandler *th.BotHandler
var adminIds []int64
var isRunning bool
var hostname string
var hashStorage *global.HashStorage
var (
bot *telego.Bot
botHandler *th.BotHandler
adminIds []int64
isRunning bool
hostname string
hashStorage *global.HashStorage
)
type LoginStatus byte
@ -280,7 +283,6 @@ func (t *Tgbot) answerCommand(message *telego.Message, chatId int64, isAdmin boo
}
func (t *Tgbot) asnwerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool) {
chatId := callbackQuery.Message.GetChat().ID
if isAdmin {
@ -866,7 +868,7 @@ func (t *Tgbot) SendMsgToTgbot(chatId int64, msg string, replyMarkup ...telego.R
Text: message,
ParseMode: "HTML",
}
//only add replyMarkup to last message
// only add replyMarkup to last message
if len(replyMarkup) > 0 && n == (len(allMessages)-1) {
params.ReplyMarkup = replyMarkup[0]
}
@ -1030,9 +1032,15 @@ func (t *Tgbot) getInboundUsages() string {
return info
}
func (t *Tgbot) clientInfoMsg(traffic *xray.ClientTraffic, printEnabled bool, printOnline bool, printActive bool,
printDate bool, printTraffic bool, printRefreshed bool) string {
func (t *Tgbot) clientInfoMsg(
traffic *xray.ClientTraffic,
printEnabled bool,
printOnline bool,
printActive bool,
printDate bool,
printTraffic bool,
printRefreshed bool,
) string {
now := time.Now().Unix()
expiryTime := ""
flag := false
@ -1544,7 +1552,6 @@ func (t *Tgbot) sendBackup(chatId int64) {
}
} else {
logger.Error("Error in opening db file for backup: ", err)
}
file, err = os.Open(xray.GetConfigPath())

4
web/service/user.go
View file

@ -2,6 +2,7 @@ package service
import (
"errors"
"x-ui/database"
"x-ui/database/model"
"x-ui/logger"
@ -9,8 +10,7 @@ import (
"gorm.io/gorm"
)
type UserService struct {
}
type UserService struct{}
func (s *UserService) GetFirstUser() (*model.User, error) {
db := database.GetDB()

17
web/service/xray.go
View file

@ -4,16 +4,19 @@ import (
"encoding/json"
"errors"
"sync"
"x-ui/logger"
"x-ui/xray"
"go.uber.org/atomic"
)
var p *xray.Process
var lock sync.Mutex
var isNeedXrayRestart atomic.Bool
var result string
var (
p *xray.Process
lock sync.Mutex
isNeedXrayRestart atomic.Bool
result string
)
type XrayService struct {
inboundService InboundService
@ -87,7 +90,6 @@ func (s *XrayService) GetXrayConfig() (*xray.Config, error) {
// check users active or not
clientStats := inbound.ClientStats
for _, clientTraffic := range clientStats {
indexDecrease := 0
for index, client := range clients {
c := client.(map[string]interface{})
@ -96,20 +98,15 @@ func (s *XrayService) GetXrayConfig() (*xray.Config, error) {
clients = RemoveIndex(clients, index-indexDecrease)
indexDecrease++
logger.Info("Remove Inbound User ", c["email"], " due the expire or traffic limit")
}
}
}
}
// clear client config for additional parameters
var final_clients []interface{}
for _, client := range clients {
c := client.(map[string]interface{})
if c["enable"] != nil {
if enable, ok := c["enable"].(bool); ok && !enable {
continue

1
web/service/xray_setting.go
View file

@ -8,6 +8,7 @@ import (
"net/http"
"os"
"time"
"x-ui/util/common"
"x-ui/xray"
)

1
web/session/session.go
View file

@ -2,6 +2,7 @@ package session
import (
"encoding/gob"
"x-ui/database/model"
sessions "github.com/Calidity/gin-sessions"

3
web/web.go
View file

@ -13,6 +13,7 @@ import (
"strconv"
"strings"
"time"
"x-ui/config"
"x-ui/logger"
"x-ui/util/common"
@ -295,7 +296,7 @@ func (s *Server) startTask() {
}
func (s *Server) Start() (err error) {
//This is an anonymous function, no function name
// This is an anonymous function, no function name
defer func() {
if err != nil {
s.Stop()

5
xray/api.go
View file

@ -6,6 +6,7 @@ import (
"fmt"
"regexp"
"time"
"x-ui/logger"
"x-ui/util/common"
@ -162,8 +163,8 @@ func (x *XrayAPI) GetTraffic(reset bool) ([]*Traffic, []*ClientTraffic, error) {
if x.grpcClient == nil {
return nil, nil, common.NewError("xray api is not initialized")
}
var trafficRegex = regexp.MustCompile("(inbound|outbound)>>>([^>]+)>>>traffic>>>(downlink|uplink)")
var ClientTrafficRegex = regexp.MustCompile("(user)>>>([^>]+)>>>traffic>>>(downlink|uplink)")
trafficRegex := regexp.MustCompile("(inbound|outbound)>>>([^>]+)>>>traffic>>>(downlink|uplink)")
ClientTrafficRegex := regexp.MustCompile("(user)>>>([^>]+)>>>traffic>>>(downlink|uplink)")
client := *x.StatsServiceClient
ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)

1
xray/config.go
View file

@ -2,6 +2,7 @@ package xray
import (
"bytes"
"x-ui/util/json_util"
)

1
xray/inbound.go
View file

@ -2,6 +2,7 @@ package xray
import (
"bytes"
"x-ui/util/json_util"
)

1
xray/log_writer.go
View file

@ -3,6 +3,7 @@ package xray
import (
"regexp"
"strings"
"x-ui/logger"
)

2
xray/process.go
View file

@ -202,7 +202,7 @@ func (p *process) Start() (err error) {
if err != nil {
return common.NewErrorf("Failed to generate xray configuration file: %v", err)
}
err = os.MkdirAll(config.GetLogFolder(), 0770)
if err != nil {
logger.Warningf("Something went wrong: %s", err)