v1.2.3

Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>

.github/workflows/release.yml

@@ -1,12 +1,16 @@
-name: Release 3X-ui
+name: Release X-ui
 on:
+  push:
+    tags:
+      - "*"
   workflow_dispatch:
+
 jobs:
- linuxamd64build:
+  linuxamd64build:
     name: build x-ui amd64 version
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3.5.0
+      - uses: actions/checkout@v3.5.1
       - name: Set up Go
         uses: actions/setup-go@v4.0.0
         with:
@@ -42,3 +46,45 @@ jobs:
           asset_name: x-ui-linux-amd64.tar.gz
           prerelease: true
           overwrite: true
+  linuxarm64build:
+    name: build x-ui arm64 version
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v3.5.1
+      - name: Set up Go
+        uses: actions/setup-go@v4.0.0
+        with:
+          go-version: 'stable'
+      - name: build linux arm64 version
+        run: |
+          sudo apt-get update
+          sudo apt install gcc-aarch64-linux-gnu
+          CGO_ENABLED=1 GOOS=linux GOARCH=arm64 CC=aarch64-linux-gnu-gcc go build -o xui-release -v main.go
+          mkdir x-ui
+          cp xui-release x-ui/xui-release
+          cp x-ui.service x-ui/x-ui.service
+          cp x-ui.sh x-ui/x-ui.sh
+          cd x-ui
+          mv xui-release x-ui
+          mkdir bin
+          cd bin
+          wget https://github.com/mhsanaei/xray-core/releases/latest/download/Xray-linux-arm64-v8a.zip
+          unzip Xray-linux-arm64-v8a.zip
+          rm -f Xray-linux-arm64-v8a.zip geoip.dat geosite.dat
+          wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat
+          wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat
+          wget https://github.com/bootmortis/iran-hosted-domains/releases/latest/download/iran.dat
+          mv xray xray-linux-arm64
+          cd ..
+          cd ..
+      - name: package
+        run: tar -zcvf x-ui-linux-arm64.tar.gz x-ui
+      - name: upload
+        uses: svenstaro/upload-release-action@2.5.0
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          tag: ${{ github.ref }}
+          file: x-ui-linux-arm64.tar.gz
+          asset_name: x-ui-linux-arm64.tar.gz
+          prerelease: true
+          overwrite: true

config/version

@@ -1 +1 @@
-1.2.2
+1.2.3

web/controller/server.go

@@ -137,7 +137,7 @@ func (a *ServerController) getDb(c *gin.Context) {
 	}
 	// Set the headers for the response
 	c.Header("Content-Type", "application/octet-stream")
-	c.Header("Content-Disposition", "attachment; filename=xui.db")
+	c.Header("Content-Disposition", "attachment; filename=x-ui.db")
 
 	// Write the file contents to the response
 	c.Writer.Write(db)

web/service/inbound.go

@@ -433,7 +433,7 @@ func (s *InboundService) adjustTraffics(traffics []*xray.ClientTraffic) (full_tr
 		}
 	}()
 
-	for traffic_index, traffic := range traffics {
+	for _, traffic := range traffics {
 		inbound := &model.Inbound{}
 		client_traffic := &xray.ClientTraffic{}
 		err := db.Model(xray.ClientTraffic{}).Where("email = ?", traffic.Email).First(client_traffic).Error
@@ -492,9 +492,9 @@ func (s *InboundService) adjustTraffics(traffics []*xray.ClientTraffic) (full_tr
 			}
 		}
 
-		traffics[traffic_index] = client_traffic
+		full_traffics = append(full_traffics, client_traffic)
 	}
-	return traffics, nil
+	return full_traffics, nil
 }
 
 func (s *InboundService) DisableInvalidInbounds() (int64, error) {
@@ -507,6 +507,17 @@ func (s *InboundService) DisableInvalidInbounds() (int64, error) {
 	count := result.RowsAffected
 	return count, err
 }
+func (s *InboundService) RemoveOrphanedTraffics() {
+	db := database.GetDB()
+	db.Exec(`
+		DELETE FROM client_traffics
+		WHERE email NOT IN (
+			SELECT JSON_EXTRACT(client.value, '$.email')
+			FROM inbounds,
+				JSON_EACH(JSON_EXTRACT(inbounds.settings, '$.clients')) AS client
+		)
+	`)
+}
 func (s *InboundService) DisableInvalidClients() (int64, error) {
 	db := database.GetDB()
 	now := time.Now().Unix() * 1000

web/service/xray.go

@@ -69,6 +69,7 @@ func (s *XrayService) GetXrayConfig() (*xray.Config, error) {
 	}
 
 	s.inboundService.DisableInvalidClients()
+	s.inboundService.RemoveOrphanedTraffics()
 
 	inbounds, err := s.inboundService.GetAllInbounds()
 	if err != nil {

x-ui.sh

@@ -726,19 +726,19 @@ run_speedtest() {
         # If not installed, install it
         if command -v dnf &> /dev/null; then
             sudo dnf install -y curl
-            curl -s https://install.speedtest.net/app/cli/install.rpm.sh | sudo bash
+            curl -s https://packagecloud.io/install/repositories/ookla/speedtest-cli/script.rpm.sh | sudo bash
             sudo dnf install -y speedtest
         elif command -v yum &> /dev/null; then
             sudo yum install -y curl
-            curl -s https://install.speedtest.net/app/cli/install.rpm.sh | sudo bash
+            curl -s https://packagecloud.io/install/repositories/ookla/speedtest-cli/script.rpm.sh | sudo bash
             sudo yum install -y speedtest
         elif command -v apt-get &> /dev/null; then
             sudo apt-get update && sudo apt-get install -y curl
-            curl -s https://install.speedtest.net/app/cli/install.deb.sh | sudo bash
+            curl -s https://packagecloud.io/install/repositories/ookla/speedtest-cli/script.deb.sh | sudo bash
             sudo apt-get install -y speedtest
         elif command -v apt &> /dev/null; then
             sudo apt update && sudo apt install -y curl
-            curl -s https://install.speedtest.net/app/cli/install.deb.sh | sudo bash
+            curl -s https://packagecloud.io/install/repositories/ookla/speedtest-cli/script.deb.sh | sudo bash
             sudo apt install -y speedtest
         else
             echo "Error: Package manager not found. You may need to install Speedtest manually."