fix: typo

.github/build/friendly-filenames.json

@@ -1,33 +1,95 @@
 {
-    "android-arm64": { "friendlyName": "android-arm64-v8a" },
+  "android-arm64": {
-    "darwin-amd64": { "friendlyName": "macos-64" },
+    "friendlyName": "android-arm64-v8a"
-    "darwin-arm64": { "friendlyName": "macos-arm64-v8a" },
+  },
-    "dragonfly-amd64": { "friendlyName": "dragonfly-64" },
+  "darwin-amd64": {
-    "freebsd-386": { "friendlyName": "freebsd-32" },
+    "friendlyName": "macos-64"
-    "freebsd-amd64": { "friendlyName": "freebsd-64" },
+  },
-    "freebsd-arm64": { "friendlyName": "freebsd-arm64-v8a" },
+  "darwin-arm64": {
-    "freebsd-arm7": { "friendlyName": "freebsd-arm32-v7a" },
+    "friendlyName": "macos-arm64-v8a"
-    "linux-386": { "friendlyName": "linux-32" },
+  },
-    "linux-amd64": { "friendlyName": "linux-64" },
+  "dragonfly-amd64": {
-    "linux-arm5": { "friendlyName": "linux-arm32-v5" },
+    "friendlyName": "dragonfly-64"
-    "linux-arm64": { "friendlyName": "linux-arm64-v8a" },
+  },
-    "linux-arm6": { "friendlyName": "linux-arm32-v6" },
+  "freebsd-386": {
-    "linux-arm7": { "friendlyName": "linux-arm32-v7a" },
+    "friendlyName": "freebsd-32"
-    "linux-mips64le": { "friendlyName": "linux-mips64le" },
+  },
-    "linux-mips64": { "friendlyName": "linux-mips64" },
+  "freebsd-amd64": {
-    "linux-mipslesoftfloat": { "friendlyName": "linux-mips32le-softfloat" },
+    "friendlyName": "freebsd-64"
-    "linux-mipsle": { "friendlyName": "linux-mips32le" },
+  },
-    "linux-mipssoftfloat": { "friendlyName": "linux-mips32-softfloat" },
+  "freebsd-arm64": {
-    "linux-mips": { "friendlyName": "linux-mips32" },
+    "friendlyName": "freebsd-arm64-v8a"
-    "linux-ppc64le": { "friendlyName": "linux-ppc64le" },
+  },
-    "linux-ppc64": { "friendlyName": "linux-ppc64" },
+  "freebsd-arm7": {
-    "linux-riscv64": { "friendlyName": "linux-riscv64" },
+    "friendlyName": "freebsd-arm32-v7a"
-    "linux-s390x": { "friendlyName": "linux-s390x" },
+  },
-    "openbsd-386": { "friendlyName": "openbsd-32" },
+  "linux-386": {
-    "openbsd-amd64": { "friendlyName": "openbsd-64" },
+    "friendlyName": "linux-32"
-    "openbsd-arm64": { "friendlyName": "openbsd-arm64-v8a" },
+  },
-    "openbsd-arm7": { "friendlyName": "openbsd-arm32-v7a" },
+  "linux-amd64": {
-    "windows-386": { "friendlyName": "windows-32" },
+    "friendlyName": "linux-64"
-    "windows-amd64": { "friendlyName": "windows-64" },
+  },
-    "windows-arm7": { "friendlyName": "windows-arm32-v7a" }
+  "linux-arm5": {
+    "friendlyName": "linux-arm32-v5"
+  },
+  "linux-arm64": {
+    "friendlyName": "linux-arm64-v8a"
+  },
+  "linux-arm6": {
+    "friendlyName": "linux-arm32-v6"
+  },
+  "linux-arm7": {
+    "friendlyName": "linux-arm32-v7a"
+  },
+  "linux-mips64le": {
+    "friendlyName": "linux-mips64le"
+  },
+  "linux-mips64": {
+    "friendlyName": "linux-mips64"
+  },
+  "linux-mipslesoftfloat": {
+    "friendlyName": "linux-mips32le-softfloat"
+  },
+  "linux-mipsle": {
+    "friendlyName": "linux-mips32le"
+  },
+  "linux-mipssoftfloat": {
+    "friendlyName": "linux-mips32-softfloat"
+  },
+  "linux-mips": {
+    "friendlyName": "linux-mips32"
+  },
+  "linux-ppc64le": {
+    "friendlyName": "linux-ppc64le"
+  },
+  "linux-ppc64": {
+    "friendlyName": "linux-ppc64"
+  },
+  "linux-riscv64": {
+    "friendlyName": "linux-riscv64"
+  },
+  "linux-s390x": {
+    "friendlyName": "linux-s390x"
+  },
+  "openbsd-386": {
+    "friendlyName": "openbsd-32"
+  },
+  "openbsd-amd64": {
+    "friendlyName": "openbsd-64"
+  },
+  "openbsd-arm64": {
+    "friendlyName": "openbsd-arm64-v8a"
+  },
+  "openbsd-arm7": {
+    "friendlyName": "openbsd-arm32-v7a"
+  },
+  "windows-386": {
+    "friendlyName": "windows-32"
+  },
+  "windows-amd64": {
+    "friendlyName": "windows-64"
+  },
+  "windows-arm7": {
+    "friendlyName": "windows-arm32-v7a"
+  }
 }

.github/workflows/docker.yml

@@ -21,24 +21,20 @@ jobs:
     steps:
       - name: Check out the repo
         uses: actions/checkout@v2
-      -
+      - name: Set up Docker Buildx
-        name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
-      - 
+      - name: Log in to the Container registry
-        name: Log in to the Container registry
         uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      -
+      - name: Docker meta
-        name: Docker meta
         id: meta
         uses: docker/metadata-action@v4
         with:
           images: ghcr.io/${{ github.repository }}
-      -
+      - name: Build and push
-        name: Build and push
         uses: docker/build-push-action@v2
         with:
           context: .

README.md

@@ -1,4 +1,5 @@
 # XrayR
+
 [![](https://img.shields.io/badge/TgChat-@XrayR讨论-blue.svg)](https://t.me/XrayR_project)
 [![](https://img.shields.io/badge/Channel-@XrayR通知-blue.svg)](https://t.me/XrayR_channel)
 ![](https://img.shields.io/github/stars/XrayR-project/XrayR)
@@ -14,11 +15,13 @@ A Xray backend framework that can easily support many panels.
 如果您喜欢本项目，可以右上角点个star+watch，持续关注本项目的进展。
 
 使用教程：[详细使用教程](https://xrayr-project.github.io/XrayR-doc/)
+
 ## 免责声明
 
 本项目只是本人个人学习开发并维护，本人不保证任何可用性，也不对使用本软件造成的任何后果负责。
 
 ## 特点
+
 * 永久开源且免费。
 * 支持V2ray，Trojan， Shadowsocks多种协议。
 * 支持Vless和XTLS等新特性。
@@ -45,6 +48,7 @@ A Xray backend framework that can easily support many panels.
 | 节点端口限速    | √     | √      | √           |
 | 按照用户限速    | √     | √      | √           |
 | 自定义DNS       | √     | √      | √           |
+
 ## 支持前端
 
 | 前端                                                   | v2ray | trojan | shadowsocks                    |
@@ -56,14 +60,19 @@ A Xray backend framework that can easily support many panels.
 | [WHMCS (V2RaySocks)](https://v2raysocks.doxtex.com/)   | √     | √      | √                              |
 
 ## 软件安装
+
 ### 一键安装
+
 ```
 wget -N https://raw.githubusercontent.com/XrayR-project/XrayR-release/master/install.sh && bash install.sh
 ```
+
 ### 使用Docker部署软件
+
 [Docker部署教程](https://xrayr-project.github.io/XrayR-doc/xrayr-xia-zai-he-an-zhuang/install/docker)
 
 ### 手动安装
+
 [手动安装教程](https://xrayr-project.github.io/XrayR-doc/xrayr-xia-zai-he-an-zhuang/install/manual)
 
 ## 配置文件及详细使用教程

api/pmpanel/pmpanel.go

@@ -11,8 +11,9 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/XrayR-project/XrayR/api"
 	"github.com/go-resty/resty/v2"
+
+	"github.com/XrayR-project/XrayR/api"
 )
 
 // APIClient create a api client to the panel.

api/proxypanel/proxypanel.go

@@ -11,8 +11,9 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/XrayR-project/XrayR/api"
 	"github.com/go-resty/resty/v2"
+
+	"github.com/XrayR-project/XrayR/api"
 )
 
 // APIClient create a api client to the panel.

api/sspanel/sspanel.go

@@ -13,8 +13,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/XrayR-project/XrayR/api"
 	"github.com/go-resty/resty/v2"
+
+	"github.com/XrayR-project/XrayR/api"
 )
 
 var (

api/v2board/v2board.go

@@ -12,9 +12,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/XrayR-project/XrayR/api"
 	"github.com/bitly/go-simplejson"
 	"github.com/go-resty/resty/v2"
+
+	"github.com/XrayR-project/XrayR/api"
 )
 
 // APIClient create an api client to the panel.

api/v2raysocks/v2raysocks.go

@@ -12,9 +12,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/XrayR-project/XrayR/api"
 	"github.com/bitly/go-simplejson"
 	"github.com/go-resty/resty/v2"
+
+	"github.com/XrayR-project/XrayR/api"
 )
 
 // APIClient create an api client to the panel.

app/mydispatcher/default.go

@@ -9,8 +9,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/XrayR-project/XrayR/common/limiter"
-	"github.com/XrayR-project/XrayR/common/rule"
 	"github.com/xtls/xray-core/common"
 	"github.com/xtls/xray-core/common/buf"
 	"github.com/xtls/xray-core/common/log"
@@ -26,6 +24,9 @@ import (
 	"github.com/xtls/xray-core/features/stats"
 	"github.com/xtls/xray-core/transport"
 	"github.com/xtls/xray-core/transport/pipe"
+
+	"github.com/XrayR-project/XrayR/common/limiter"
+	"github.com/XrayR-project/XrayR/common/rule"
 )
 
 var errSniffingTimeout = newError("timeout on sniffing")

common/legocmd/cmd/accounts_storage.go

@@ -13,11 +13,12 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/XrayR-project/XrayR/common/legocmd/log"
 	"github.com/go-acme/lego/v4/certcrypto"
 	"github.com/go-acme/lego/v4/lego"
 	"github.com/go-acme/lego/v4/registration"
 	"github.com/urfave/cli"
+
+	"github.com/XrayR-project/XrayR/common/legocmd/log"
 )
 
 const (
@@ -59,7 +60,6 @@ const (
 //	     │      │             └── CA server ("server" option)
 //	     │      └── root accounts directory
 //	     └── "path" option
-//
 type AccountsStorage struct {
 	userID          string
 	rootPath        string

common/legocmd/cmd/certs_storage.go

@@ -11,11 +11,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/XrayR-project/XrayR/common/legocmd/log"
 	"github.com/go-acme/lego/v4/certcrypto"
 	"github.com/go-acme/lego/v4/certificate"
 	"github.com/urfave/cli"
 	"golang.org/x/net/idna"
+
+	"github.com/XrayR-project/XrayR/common/legocmd/log"
 )
 
 const (
@@ -36,7 +37,6 @@ const (
 //	./.lego/archives/
 //	     │      └── archived certificates directory
 //	     └── "path" option
-//
 type CertificatesStorage struct {
 	rootPath    string
 	archivePath string

common/legocmd/cmd/cmd_before.go

@@ -1,8 +1,9 @@
 package cmd
 
 import (
-	"github.com/XrayR-project/XrayR/common/legocmd/log"
 	"github.com/urfave/cli"
+
+	"github.com/XrayR-project/XrayR/common/legocmd/log"
 )
 
 func Before(ctx *cli.Context) error {

common/legocmd/cmd/cmd_renew.go

@@ -5,11 +5,12 @@ import (
 	"crypto/x509"
 	"time"
 
-	"github.com/XrayR-project/XrayR/common/legocmd/log"
 	"github.com/go-acme/lego/v4/certcrypto"
 	"github.com/go-acme/lego/v4/certificate"
 	"github.com/go-acme/lego/v4/lego"
 	"github.com/urfave/cli"
+
+	"github.com/XrayR-project/XrayR/common/legocmd/log"
 )
 
 const (

common/legocmd/cmd/cmd_revoke.go

@@ -1,8 +1,9 @@
 package cmd
 
 import (
-	"github.com/XrayR-project/XrayR/common/legocmd/log"
 	"github.com/urfave/cli"
+
+	"github.com/XrayR-project/XrayR/common/legocmd/log"
 )
 
 func createRevoke() cli.Command {

common/legocmd/cmd/cmd_run.go

@@ -6,11 +6,12 @@ import (
 	"os"
 	"strings"
 
-	"github.com/XrayR-project/XrayR/common/legocmd/log"
 	"github.com/go-acme/lego/v4/certificate"
 	"github.com/go-acme/lego/v4/lego"
 	"github.com/go-acme/lego/v4/registration"
 	"github.com/urfave/cli"
+
+	"github.com/XrayR-project/XrayR/common/legocmd/log"
 )
 
 func createRun() cli.Command {

common/legocmd/cmd/setup.go

@@ -9,11 +9,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/XrayR-project/XrayR/common/legocmd/log"
 	"github.com/go-acme/lego/v4/certcrypto"
 	"github.com/go-acme/lego/v4/lego"
 	"github.com/go-acme/lego/v4/registration"
 	"github.com/urfave/cli"
+
+	"github.com/XrayR-project/XrayR/common/legocmd/log"
 )
 
 const filePerm os.FileMode = 0o600

common/legocmd/cmd/setup_challenges.go

@@ -5,7 +5,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/XrayR-project/XrayR/common/legocmd/log"
 	"github.com/go-acme/lego/v4/challenge"
 	"github.com/go-acme/lego/v4/challenge/dns01"
 	"github.com/go-acme/lego/v4/challenge/http01"
@@ -15,6 +14,8 @@ import (
 	"github.com/go-acme/lego/v4/providers/http/memcached"
 	"github.com/go-acme/lego/v4/providers/http/webroot"
 	"github.com/urfave/cli"
+
+	"github.com/XrayR-project/XrayR/common/legocmd/log"
 )
 
 func setupChallenges(ctx *cli.Context, client *lego.Client) {

common/legocmd/lego.go

@@ -11,8 +11,9 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/XrayR-project/XrayR/common/legocmd/cmd"
 	"github.com/urfave/cli"
+
+	"github.com/XrayR-project/XrayR/common/legocmd/cmd"
 )
 
 var version = "dev"

common/legocmd/log/log.go

@@ -57,4 +57,3 @@ func Warnf(format string, args ...interface{}) {
 func Infof(format string, args ...interface{}) {
 	Printf("[INFO] "+format, args...)
 }
-

common/limiter/limiter.go

@@ -5,8 +5,9 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/XrayR-project/XrayR/api"
 	"golang.org/x/time/rate"
+
+	"github.com/XrayR-project/XrayR/api"
 )
 
 type UserInfo struct {

common/limiter/rate.go

@@ -1,9 +1,8 @@
 package limiter
 
 import (
-	"io"
-
 	"context"
+	"io"
 
 	"github.com/xtls/xray-core/common"
 	"github.com/xtls/xray-core/common/buf"

common/rule/rule.go

@@ -8,8 +8,9 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/XrayR-project/XrayR/api"
 	mapset "github.com/deckarep/golang-set"
+
+	"github.com/XrayR-project/XrayR/api"
 )
 
 type RuleManager struct {

main/custom_outbound.json

@@ -15,10 +15,12 @@
     "tag": "socks5-warp",
     "protocol": "socks",
     "settings": {
-            "servers": [{
+      "servers": [
+        {
           "address": "127.0.0.1",
           "port": 1080
-            }]
+        }
+      ]
     }
   },
   {

main/distro/all/all.go

@@ -3,11 +3,12 @@ package all
 import (
 	// The following are necessary as they register handlers in their init functions.
 
+	_ "github.com/xtls/xray-core/app/proxyman/inbound"
+	_ "github.com/xtls/xray-core/app/proxyman/outbound"
+
 	// Required features. Can't remove unless there is replacements.
 	// _ "github.com/xtls/xray-core/app/dispatcher"
 	_ "github.com/XrayR-project/XrayR/app/mydispatcher"
-	_ "github.com/xtls/xray-core/app/proxyman/inbound"
-	_ "github.com/xtls/xray-core/app/proxyman/outbound"
 
 	// Default commander and all its services. This is an optional feature.
 	_ "github.com/xtls/xray-core/app/commander"

main/main.go

@@ -12,9 +12,10 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/XrayR-project/XrayR/panel"
 	"github.com/fsnotify/fsnotify"
 	"github.com/spf13/viper"
+
+	"github.com/XrayR-project/XrayR/panel"
 )
 
 var (

panel/panel.go

@@ -8,6 +8,14 @@ import (
 
 	"github.com/XrayR-project/XrayR/app/mydispatcher"
 
+	"github.com/imdario/mergo"
+	"github.com/r3labs/diff/v2"
+	"github.com/xtls/xray-core/app/proxyman"
+	"github.com/xtls/xray-core/app/stats"
+	"github.com/xtls/xray-core/common/serial"
+	"github.com/xtls/xray-core/core"
+	"github.com/xtls/xray-core/infra/conf"
+
 	"github.com/XrayR-project/XrayR/api"
 	"github.com/XrayR-project/XrayR/api/pmpanel"
 	"github.com/XrayR-project/XrayR/api/proxypanel"
@@ -17,13 +25,6 @@ import (
 	_ "github.com/XrayR-project/XrayR/main/distro/all"
 	"github.com/XrayR-project/XrayR/service"
 	"github.com/XrayR-project/XrayR/service/controller"
-	"github.com/imdario/mergo"
-	"github.com/r3labs/diff/v2"
-	"github.com/xtls/xray-core/app/proxyman"
-	"github.com/xtls/xray-core/app/stats"
-	"github.com/xtls/xray-core/common/serial"
-	"github.com/xtls/xray-core/core"
-	"github.com/xtls/xray-core/infra/conf"
 )
 
 // Panel Structure

service/controller/control.go

@@ -4,13 +4,14 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/XrayR-project/XrayR/api"
 	"github.com/xtls/xray-core/common/protocol"
 	"github.com/xtls/xray-core/core"
 	"github.com/xtls/xray-core/features/inbound"
 	"github.com/xtls/xray-core/features/outbound"
 	"github.com/xtls/xray-core/features/stats"
 	"github.com/xtls/xray-core/proxy"
+
+	"github.com/XrayR-project/XrayR/api"
 )
 
 func (c *Controller) removeInbound(tag string) error {

service/controller/controller.go

@@ -6,10 +6,6 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/XrayR-project/XrayR/api"
-	"github.com/XrayR-project/XrayR/app/mydispatcher"
-	"github.com/XrayR-project/XrayR/common/legocmd"
-	"github.com/XrayR-project/XrayR/common/serverstatus"
 	"github.com/xtls/xray-core/common/protocol"
 	"github.com/xtls/xray-core/common/task"
 	"github.com/xtls/xray-core/core"
@@ -17,6 +13,11 @@ import (
 	"github.com/xtls/xray-core/features/outbound"
 	"github.com/xtls/xray-core/features/routing"
 	"github.com/xtls/xray-core/features/stats"
+
+	"github.com/XrayR-project/XrayR/api"
+	"github.com/XrayR-project/XrayR/app/mydispatcher"
+	"github.com/XrayR-project/XrayR/common/legocmd"
+	"github.com/XrayR-project/XrayR/common/serverstatus"
 )
 
 type LimitInfo struct {

service/controller/controller_test.go

@@ -8,12 +8,13 @@ import (
 	"syscall"
 	"testing"
 
+	"github.com/xtls/xray-core/core"
+	"github.com/xtls/xray-core/infra/conf"
+
 	"github.com/XrayR-project/XrayR/api"
 	"github.com/XrayR-project/XrayR/api/sspanel"
 	_ "github.com/XrayR-project/XrayR/main/distro/all"
 	. "github.com/XrayR-project/XrayR/service/controller"
-	"github.com/xtls/xray-core/core"
-	"github.com/xtls/xray-core/infra/conf"
 )
 
 func TestController(t *testing.T) {

service/controller/inboundbuilder.go

@@ -5,12 +5,13 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/XrayR-project/XrayR/api"
-	"github.com/XrayR-project/XrayR/common/legocmd"
 	"github.com/xtls/xray-core/common/net"
 	"github.com/xtls/xray-core/common/uuid"
 	"github.com/xtls/xray-core/core"
 	"github.com/xtls/xray-core/infra/conf"
+
+	"github.com/XrayR-project/XrayR/api"
+	"github.com/XrayR-project/XrayR/common/legocmd"
 )
 
 // InboundBuilder build Inbound config for different protocol

service/controller/outboundbuilder.go

@@ -4,10 +4,11 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/XrayR-project/XrayR/api"
 	"github.com/xtls/xray-core/common/net"
 	"github.com/xtls/xray-core/core"
 	"github.com/xtls/xray-core/infra/conf"
+
+	"github.com/XrayR-project/XrayR/api"
 )
 
 // OutboundBuilder build freedom outbund config for addoutbound

service/controller/userbuilder.go

@@ -4,13 +4,14 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/XrayR-project/XrayR/api"
 	"github.com/xtls/xray-core/common/protocol"
 	"github.com/xtls/xray-core/common/serial"
 	"github.com/xtls/xray-core/infra/conf"
 	"github.com/xtls/xray-core/proxy/shadowsocks"
 	"github.com/xtls/xray-core/proxy/trojan"
 	"github.com/xtls/xray-core/proxy/vless"
+
+	"github.com/XrayR-project/XrayR/api"
 )
 
 var AEADMethod = []shadowsocks.CipherType{shadowsocks.CipherType_AES_128_GCM, shadowsocks.CipherType_AES_256_GCM, shadowsocks.CipherType_CHACHA20_POLY1305, shadowsocks.CipherType_XCHACHA20_POLY1305}