Buriburizaemon/Ratte
1
0
Fork 0
mirror of https://github.com/InazumaV/Ratte.git synced 2026-02-04 12:40:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

update deps

Browse Source
This commit is contained in:
Yuzuki616
2024-11-23 02:30:13 +09:00
parent 8eb5c97ccd
commit af1d678153
3 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@@ -5,7 +5,7 @@ go 1.22.0
toolchain go1.23.1 toolchain go1.23.1
require ( require (
github.com/Yuzuki616/Ratte-Interface v0.0.0-20241122170215-57da39558e5a github.com/Yuzuki616/Ratte-Interface v0.0.0-20241122172739-1b3f94836144
github.com/fsnotify/fsnotify v1.7.0 github.com/fsnotify/fsnotify v1.7.0
github.com/go-acme/lego/v4 v4.18.0 github.com/go-acme/lego/v4 v4.18.0
github.com/goccy/go-json v0.10.3 github.com/goccy/go-json v0.10.3

4
go.sum
View File

@@ -68,6 +68,10 @@ github.com/Yuzuki616/Ratte-Interface v0.0.0-20241118194538-facf11a8e444 h1:WNPpK
github.com/Yuzuki616/Ratte-Interface v0.0.0-20241118194538-facf11a8e444/go.mod h1:oW6wbZfawdudu9VbTy2YIWoMNpfttYX8qcsM19oXCCI= github.com/Yuzuki616/Ratte-Interface v0.0.0-20241118194538-facf11a8e444/go.mod h1:oW6wbZfawdudu9VbTy2YIWoMNpfttYX8qcsM19oXCCI=
github.com/Yuzuki616/Ratte-Interface v0.0.0-20241122170215-57da39558e5a h1:kG4UIW63SqKhWaRyNBqKtaOnO9mF2GV6E/Grv/kBlX8= github.com/Yuzuki616/Ratte-Interface v0.0.0-20241122170215-57da39558e5a h1:kG4UIW63SqKhWaRyNBqKtaOnO9mF2GV6E/Grv/kBlX8=
github.com/Yuzuki616/Ratte-Interface v0.0.0-20241122170215-57da39558e5a/go.mod h1:oW6wbZfawdudu9VbTy2YIWoMNpfttYX8qcsM19oXCCI= github.com/Yuzuki616/Ratte-Interface v0.0.0-20241122170215-57da39558e5a/go.mod h1:oW6wbZfawdudu9VbTy2YIWoMNpfttYX8qcsM19oXCCI=
github.com/Yuzuki616/Ratte-Interface v0.0.0-20241122172417-cc1eed392b81 h1:3ZSNh/rMEs2VA6DaYaoZQzNHZz5i+4D19DMQa4UHFKI=
github.com/Yuzuki616/Ratte-Interface v0.0.0-20241122172417-cc1eed392b81/go.mod h1:oW6wbZfawdudu9VbTy2YIWoMNpfttYX8qcsM19oXCCI=
github.com/Yuzuki616/Ratte-Interface v0.0.0-20241122172739-1b3f94836144 h1:cAwvrrndgL3R68WwMWAFweyrIgy+0HO4VcQG74jVxyI=
github.com/Yuzuki616/Ratte-Interface v0.0.0-20241122172739-1b3f94836144/go.mod h1:oW6wbZfawdudu9VbTy2YIWoMNpfttYX8qcsM19oXCCI=
github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
github.com/akamai/AkamaiOPEN-edgegrid-golang v1.2.2 h1:F1j7z+/DKEsYqZNoxC6wvfmaiDneLsQOFQmuq9NADSY= github.com/akamai/AkamaiOPEN-edgegrid-golang v1.2.2 h1:F1j7z+/DKEsYqZNoxC6wvfmaiDneLsQOFQmuq9NADSY=
github.com/akamai/AkamaiOPEN-edgegrid-golang v1.2.2/go.mod h1:QlXr/TrICfQ/ANa76sLeQyhAJyNR9sEcfNuZBkY9jgY= github.com/akamai/AkamaiOPEN-edgegrid-golang v1.2.2/go.mod h1:QlXr/TrICfQ/ANa76sLeQyhAJyNR9sEcfNuZBkY9jgY=

18
handler/node.go
View File

@@ -1,11 +1,9 @@
package handler package handler
import ( import (
"Ratte/common/maps"
"fmt" "fmt"
"github.com/Yuzuki616/Ratte-Interface/core" "github.com/Yuzuki616/Ratte-Interface/core"
"github.com/Yuzuki616/Ratte-Interface/panel" "github.com/Yuzuki616/Ratte-Interface/panel"
"github.com/Yuzuki616/Ratte-Interface/params"
) )
func (h *Handler) PullNodeHandle(n *panel.NodeInfo) error { func (h *Handler) PullNodeHandle(n *panel.NodeInfo) error {
@@ -43,25 +41,11 @@ func (h *Handler) PullNodeHandle(n *panel.NodeInfo) error {
h.l.WithError(err).Error("Exec before add node hook failed") h.l.WithError(err).Error("Exec before add node hook failed")
} }
err = h.c.AddNode(&core.AddNodeParams{ err = h.c.AddNode(&core.AddNodeParams{
NodeInfo: core.NodeInfo{ NodeInfo: (*core.NodeInfo)(n),
CommonNodeInfo: params.CommonNodeInfo{
Type: n.Type,
VMess: n.VMess,
VLess: n.VLess,
Shadowsocks: n.Shadowsocks,
Trojan: n.Trojan,
Hysteria: n.Hysteria,
Other: n.Other,
ExpandParams: params.ExpandParams{
OtherOptions: maps.Merge(n.OtherOptions, h.Expand),
CustomData: n.CustomData,
},
},
TlsOptions: core.TlsOptions{ TlsOptions: core.TlsOptions{
CertPath: h.Cert.CertPath, CertPath: h.Cert.CertPath,
KeyPath: h.Cert.KeyPath, KeyPath: h.Cert.KeyPath,
}, },
},
}) })
if err != nil { if err != nil {
return fmt.Errorf("add node error: %w", err) return fmt.Errorf("add node error: %w", err)