minor refactor

2025-12-19 13:42:51 +08:00 · 2025-02-12 14:59:50 +03:30 · 2025-02-12 14:59:50 +03:30 · aedf4e2201
commit aedf4e2201
parent 331c1b03b8
60 changed files with 4 additions and 4 deletions
--- a/cmake/myproto.cmake
+++ b/cmake/myproto.cmake
@ -1,7 +1,7 @@
 find_package(Protobuf CONFIG REQUIRED)

 set(PROTO_FILES
-        core/cmd/nekobox_core/server/gen/libcore.proto
+        core/server/gen/libcore.proto
        )

 add_library(myproto STATIC ${PROTO_FILES})
--- a/core/cmd/nekobox_core/gen/libcore.pb.go
+++ b/core/cmd/nekobox_core/gen/libcore.pb.go
--- a/core/cmd/nekobox_core/gen/libcore.proto
+++ b/core/cmd/nekobox_core/gen/libcore.proto
--- a/core/cmd/nekobox_core/gen/libcore_grpc.pb.go
+++ b/core/cmd/nekobox_core/gen/libcore_grpc.pb.go
--- a/core/cmd/nekobox_core/gen/update_proto.sh
+++ b/core/cmd/nekobox_core/gen/update_proto.sh
--- a/core/cmd/nekobox_core/go.mod
+++ b/core/cmd/nekobox_core/go.mod
--- a/core/cmd/nekobox_core/go.sum
+++ b/core/cmd/nekobox_core/go.sum
--- a/core/cmd/nekobox_core/internal/boxapi/go_http.go
+++ b/core/cmd/nekobox_core/internal/boxapi/go_http.go
--- a/core/cmd/nekobox_core/internal/boxapi/go_net.go
+++ b/core/cmd/nekobox_core/internal/boxapi/go_net.go
--- a/core/cmd/nekobox_core/internal/boxbox/api.go
+++ b/core/cmd/nekobox_core/internal/boxbox/api.go
--- a/core/cmd/nekobox_core/internal/boxbox/box.go
+++ b/core/cmd/nekobox_core/internal/boxbox/box.go
--- a/core/cmd/nekobox_core/internal/boxdns/boxdns.go
+++ b/core/cmd/nekobox_core/internal/boxdns/boxdns.go
--- a/core/cmd/nekobox_core/internal/boxdns/dns_manager_windows.go
+++ b/core/cmd/nekobox_core/internal/boxdns/dns_manager_windows.go
--- a/core/cmd/nekobox_core/internal/boxdns/monitor_windows.go
+++ b/core/cmd/nekobox_core/internal/boxdns/monitor_windows.go
--- a/core/cmd/nekobox_core/internal/boxdns/underlying_dns.go
+++ b/core/cmd/nekobox_core/internal/boxdns/underlying_dns.go
--- a/core/cmd/nekobox_core/internal/boxdns/winipcfg/interface_change_handler.go
+++ b/core/cmd/nekobox_core/internal/boxdns/winipcfg/interface_change_handler.go
--- a/core/cmd/nekobox_core/internal/boxdns/winipcfg/luid.go
+++ b/core/cmd/nekobox_core/internal/boxdns/winipcfg/luid.go
--- a/core/cmd/nekobox_core/internal/boxdns/winipcfg/mksyscall.go
+++ b/core/cmd/nekobox_core/internal/boxdns/winipcfg/mksyscall.go
--- a/core/cmd/nekobox_core/internal/boxdns/winipcfg/netsh.go
+++ b/core/cmd/nekobox_core/internal/boxdns/winipcfg/netsh.go
--- a/core/cmd/nekobox_core/internal/boxdns/winipcfg/route_change_handler.go
+++ b/core/cmd/nekobox_core/internal/boxdns/winipcfg/route_change_handler.go
--- a/core/cmd/nekobox_core/internal/boxdns/winipcfg/types.go
+++ b/core/cmd/nekobox_core/internal/boxdns/winipcfg/types.go
--- a/core/cmd/nekobox_core/internal/boxdns/winipcfg/types_32.go
+++ b/core/cmd/nekobox_core/internal/boxdns/winipcfg/types_32.go
--- a/core/cmd/nekobox_core/internal/boxdns/winipcfg/types_64.go
+++ b/core/cmd/nekobox_core/internal/boxdns/winipcfg/types_64.go
--- a/core/cmd/nekobox_core/internal/boxdns/winipcfg/types_test.go
+++ b/core/cmd/nekobox_core/internal/boxdns/winipcfg/types_test.go
--- a/core/cmd/nekobox_core/internal/boxdns/winipcfg/types_test_32.go
+++ b/core/cmd/nekobox_core/internal/boxdns/winipcfg/types_test_32.go
--- a/core/cmd/nekobox_core/internal/boxdns/winipcfg/types_test_64.go
+++ b/core/cmd/nekobox_core/internal/boxdns/winipcfg/types_test_64.go
--- a/core/cmd/nekobox_core/internal/boxdns/winipcfg/unicast_address_change_handler.go
+++ b/core/cmd/nekobox_core/internal/boxdns/winipcfg/unicast_address_change_handler.go
--- a/core/cmd/nekobox_core/internal/boxdns/winipcfg/winipcfg.go
+++ b/core/cmd/nekobox_core/internal/boxdns/winipcfg/winipcfg.go
--- a/core/cmd/nekobox_core/internal/boxdns/winipcfg/winipcfg_test.go
+++ b/core/cmd/nekobox_core/internal/boxdns/winipcfg/winipcfg_test.go
--- a/core/cmd/nekobox_core/internal/boxdns/winipcfg/zwinipcfg_windows.go
+++ b/core/cmd/nekobox_core/internal/boxdns/winipcfg/zwinipcfg_windows.go
--- a/core/cmd/nekobox_core/internal/boxmain/cmd_check.go
+++ b/core/cmd/nekobox_core/internal/boxmain/cmd_check.go
--- a/core/cmd/nekobox_core/internal/boxmain/cmd_geoip.go
+++ b/core/cmd/nekobox_core/internal/boxmain/cmd_geoip.go
--- a/core/cmd/nekobox_core/internal/boxmain/cmd_geoip_export.go
+++ b/core/cmd/nekobox_core/internal/boxmain/cmd_geoip_export.go
--- a/core/cmd/nekobox_core/internal/boxmain/cmd_geoip_list.go
+++ b/core/cmd/nekobox_core/internal/boxmain/cmd_geoip_list.go
--- a/core/cmd/nekobox_core/internal/boxmain/cmd_geosite.go
+++ b/core/cmd/nekobox_core/internal/boxmain/cmd_geosite.go
--- a/core/cmd/nekobox_core/internal/boxmain/cmd_geosite_export.go
+++ b/core/cmd/nekobox_core/internal/boxmain/cmd_geosite_export.go
--- a/core/cmd/nekobox_core/internal/boxmain/cmd_geosite_list.go
+++ b/core/cmd/nekobox_core/internal/boxmain/cmd_geosite_list.go
--- a/core/cmd/nekobox_core/internal/boxmain/cmd_rule_set_compile.go
+++ b/core/cmd/nekobox_core/internal/boxmain/cmd_rule_set_compile.go
--- a/core/cmd/nekobox_core/internal/boxmain/cmd_run.go
+++ b/core/cmd/nekobox_core/internal/boxmain/cmd_run.go
--- a/core/cmd/nekobox_core/internal/boxmain/cmd_version.go
+++ b/core/cmd/nekobox_core/internal/boxmain/cmd_version.go
--- a/core/cmd/nekobox_core/internal/boxmain/color.go
+++ b/core/cmd/nekobox_core/internal/boxmain/color.go
--- a/core/cmd/nekobox_core/internal/boxmain/debug.go
+++ b/core/cmd/nekobox_core/internal/boxmain/debug.go
--- a/core/cmd/nekobox_core/internal/boxmain/debug_linux.go
+++ b/core/cmd/nekobox_core/internal/boxmain/debug_linux.go
--- a/core/cmd/nekobox_core/internal/boxmain/debug_stub.go
+++ b/core/cmd/nekobox_core/internal/boxmain/debug_stub.go
--- a/core/cmd/nekobox_core/internal/boxmain/main.go
+++ b/core/cmd/nekobox_core/internal/boxmain/main.go
--- a/core/cmd/nekobox_core/internal/distro/all/all.go
+++ b/core/cmd/nekobox_core/internal/distro/all/all.go
--- a/core/cmd/nekobox_core/internal/sys/set_dns_darwin.go
+++ b/core/cmd/nekobox_core/internal/sys/set_dns_darwin.go
--- a/core/cmd/nekobox_core/internal/sys/set_dns_stub.go
+++ b/core/cmd/nekobox_core/internal/sys/set_dns_stub.go
--- a/core/cmd/nekobox_core/main.go
+++ b/core/cmd/nekobox_core/main.go
--- a/core/cmd/nekobox_core/server.go
+++ b/core/cmd/nekobox_core/server.go
--- a/core/cmd/nekobox_core/server_windows.go
+++ b/core/cmd/nekobox_core/server_windows.go
--- a/core/cmd/nekobox_core/test_utils.go
+++ b/core/cmd/nekobox_core/test_utils.go
--- a/core/cmd/updater/.gitignore
+++ b/core/cmd/updater/.gitignore
--- a/core/cmd/updater/go.mod
+++ b/core/cmd/updater/go.mod
--- a/core/cmd/updater/go.sum
+++ b/core/cmd/updater/go.sum
--- a/core/cmd/updater/main.go
+++ b/core/cmd/updater/main.go
--- a/core/cmd/updater/msgbox.go
+++ b/core/cmd/updater/msgbox.go
--- a/core/cmd/updater/msgbox_windows.go
+++ b/core/cmd/updater/msgbox_windows.go
--- a/core/cmd/updater/updater.go
+++ b/core/cmd/updater/updater.go
--- a/script/build_go.sh
+++ b/script/build_go.sh
@ -19,12 +19,12 @@ mkdir -p $DEST
 export CGO_ENABLED=0

 #### Go: updater ####
-pushd core/cmd/updater
+pushd core/updater
 [ "$GOOS" == "darwin" ] || go build -o $DEST -trimpath -ldflags "-w -s"
 popd

-#### Go: nekobox_core ####
-pushd core/cmd/nekobox_core
+#### Go: core ####
+pushd core/server
 VERSION_SINGBOX=$(go list -m -f '{{.Version}}' github.com/sagernet/sing-box)
 go build -v -o $DEST -trimpath -ldflags "-w -s -X 'github.com/sagernet/sing-box/constant.Version=${VERSION_SINGBOX}'" -tags "with_clash_api,with_gvisor,with_quic,with_wireguard,with_utls,with_ech,with_dhcp"
 popd