Skip to content

Commit 5995374

Browse files
netuserclaude
andcommitted
Release 2.1.8: fix node-side xray filename exposure in defaults
Change hardcoded fallback defaults from "xray"/"xray_config.json" to "svc-runtime"/"service.json" in manager.go, grpc_client.go, and websocket_reporter.go so that nodes without explicit config fields no longer create processes or files with "xray" in the name. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 8355773 commit 5995374

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

.github/workflows/docker-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Build and Push Images Based on Version
22

33
# 在这里定义统一版本号
44
env:
5-
VERSION: "2.1.7"
5+
VERSION: "2.1.8"
66

77
on:
88
push:

docker-compose.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ services:
2525
retries: 10
2626

2727
node-binary-init:
28-
image: 0xnetuser/node-binary:2.1.7
28+
image: 0xnetuser/node-binary:2.1.8
2929
container_name: node-binary-init
3030
volumes:
3131
- node_binary:/data/node
3232
restart: "no"
3333

3434
backend:
35-
image: 0xnetuser/go-backend:2.1.7
35+
image: 0xnetuser/go-backend:2.1.8
3636
container_name: go-backend
3737
restart: unless-stopped
3838
environment:
@@ -65,7 +65,7 @@ services:
6565
start_period: 10s
6666

6767
frontend:
68-
image: 0xnetuser/nextjs-frontend:2.1.7
68+
image: 0xnetuser/nextjs-frontend:2.1.8
6969
container_name: nextjs-frontend
7070
restart: unless-stopped
7171
ports:

go-node/x/socket/websocket_reporter.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1016,11 +1016,11 @@ func (w *WebSocketReporter) getOrInitXrayManager() *xray.XrayManager {
10161016
if w.xrayManager == nil {
10171017
bin := w.xrayBin
10181018
if bin == "" {
1019-
bin = "xray"
1019+
bin = "svc-runtime"
10201020
}
10211021
cfg := w.xrayCfg
10221022
if cfg == "" {
1023-
cfg = "xray_config.json"
1023+
cfg = "service.json"
10241024
}
10251025
w.xrayManager = xray.NewXrayManager(bin, cfg, "127.0.0.1:10085")
10261026
}

go-node/x/xray/grpc_client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ type XrayGrpcClient struct {
1616

1717
// NewXrayGrpcClient creates a new gRPC client
1818
func NewXrayGrpcClient(addr string, binaryPaths ...string) *XrayGrpcClient {
19-
bp := "xray"
19+
bp := "svc-runtime"
2020
if len(binaryPaths) > 0 && binaryPaths[0] != "" {
2121
bp = binaryPaths[0]
2222
}

go-node/x/xray/manager.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ type XrayManager struct {
3030
// NewXrayManager creates a new XrayManager
3131
func NewXrayManager(binaryPath, configPath, grpcAddr string) *XrayManager {
3232
if binaryPath == "" {
33-
binaryPath = "xray"
33+
binaryPath = "svc-runtime"
3434
}
3535
if configPath == "" {
36-
configPath = "xray_config.json"
36+
configPath = "service.json"
3737
}
3838
if grpcAddr == "" {
3939
grpcAddr = "127.0.0.1:10085"

nextjs-frontend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "nextjs-frontend",
3-
"version": "2.1.7",
3+
"version": "2.1.8",
44
"private": true,
55
"scripts": {
66
"dev": "next dev",

0 commit comments

Comments
 (0)