Skip to content

Commit 303a5cb

Browse files
HansRoboHansRobo
committed
refactor: Sim Port を 10300 固定にして設定から削除
SSL Simulation Protocol のポートは 10300 で固定のため、 設定ファイルや UI から SimPort フィールドを削除した。 - config.go: SimPort フィールドを削除し、SimPort 定数（10300）を追加 - handler.go: ConfigUpdateRequest から simPort を削除、GET レスポンスからも除外 - settings.ts: Config インターフェースから simPort を削除 - StatusBar.vue: Sim Port 入力欄を削除
1 parent 997cd74 commit 303a5cb

4 files changed

Lines changed: 7 additions & 36 deletions

File tree

‎frontend/src/components/StatusBar.vue‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ async function onSystemNotifyToggle(category: ToastCategory): Promise<void> {
7777
}
7878
}
7979
const simAddress = ref('127.0.0.1')
80-
const simPort = ref(10300)
8180
const autoBallPlacementEnabled = ref(false)
8281
const autoCenterAfterGoalEnabled = ref(false)
8382
const isSettingsOpen = ref(false)
@@ -139,7 +138,6 @@ function syncInputsFromConfig() {
139138
trackedPort.value = config.value.trackedPort
140139
refereePort.value = config.value.refereePort
141140
simAddress.value = config.value.simAddress || '127.0.0.1'
142-
simPort.value = config.value.simPort || 10300
143141
autoBallPlacementEnabled.value = config.value.autoBallPlacementEnabled || false
144142
autoCenterAfterGoalEnabled.value = config.value.autoCenterAfterGoalEnabled || false
145143
}
@@ -150,7 +148,6 @@ async function onSaveConfig() {
150148
trackedPort: trackedPort.value,
151149
refereePort: refereePort.value,
152150
simAddress: simAddress.value,
153-
simPort: simPort.value,
154151
autoBallPlacementEnabled: autoBallPlacementEnabled.value,
155152
autoCenterAfterGoalEnabled: autoCenterAfterGoalEnabled.value,
156153
})
@@ -393,10 +390,6 @@ onUnmounted(() => {
393390
<span>Sim Address</span>
394391
<input class="input-control" type="text" v-model="simAddress" :disabled="settingsLoading" />
395392
</label>
396-
<label class="setting-field-label" data-tooltip="シミュレータの送信先ポート番号（SSL Simulation Protocol、デフォルト: 10300）">
397-
<span>Sim Port</span>
398-
<input class="input-control" type="number" v-model.number="simPort" min="1" max="65535" :disabled="settingsLoading" />
399-
</label>
400393
</div>
401394
</div>
402395
</div>

‎frontend/src/composables/settings.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ export interface Config {
88
trackedIP?: string
99
refereeIP?: string
1010
simAddress?: string
11-
simPort?: number
1211
autoBallPlacementEnabled?: boolean
1312
autoCenterAfterGoalEnabled?: boolean
1413
}
@@ -61,7 +60,6 @@ export function useSettings() {
6160
trackedPort: number
6261
refereePort: number
6362
simAddress?: string
64-
simPort?: number
6563
autoBallPlacementEnabled?: boolean
6664
autoCenterAfterGoalEnabled?: boolean
6765
}) => {

‎internal/config/config.go‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,14 @@ const (
1515
RefereeIP = "224.5.23.1"
1616
)
1717

18+
const SimPort = 10300
19+
1820
// Config アプリケーション設定
1921
type Config struct {
2022
VisionPort int `json:"visionPort"`
2123
TrackedPort int `json:"trackedPort"`
2224
RefereePort int `json:"refereePort"`
2325
SimAddress string `json:"simAddress"`
24-
SimPort int `json:"simPort"`
2526
AutoBallPlacementEnabled bool `json:"autoBallPlacementEnabled"`
2627
AutoCenterAfterGoalEnabled bool `json:"autoCenterAfterGoalEnabled"`
2728
mu sync.RWMutex
@@ -34,7 +35,6 @@ func DefaultConfig() *Config {
3435
TrackedPort: 10010,
3536
RefereePort: 10003,
3637
SimAddress: "127.0.0.1",
37-
SimPort: 10300,
3838
AutoBallPlacementEnabled: false,
3939
AutoCenterAfterGoalEnabled: false,
4040
}
@@ -67,19 +67,13 @@ func LoadConfig() (*Config, error) {
6767
cfg.AutoCenterAfterGoalEnabled = cfg.AutoBallPlacementEnabled
6868
}
6969

70-
// 後方互換: 旧設定ファイルの grSimAddress/grSimPort を simAddress/simPort に移行する。
70+
// 後方互換: 旧設定ファイルの grSimAddress を simAddress に移行する。
7171
if _, hasNew := raw["simAddress"]; !hasNew {
7272
var legacy struct {
7373
GrSimAddress string `json:"grSimAddress"`
74-
GrSimPort int `json:"grSimPort"`
7574
}
76-
if err := json.Unmarshal(data, &legacy); err == nil {
77-
if legacy.GrSimAddress != "" {
78-
cfg.SimAddress = legacy.GrSimAddress
79-
}
80-
if legacy.GrSimPort > 0 {
81-
cfg.SimPort = legacy.GrSimPort
82-
}
75+
if err := json.Unmarshal(data, &legacy); err == nil && legacy.GrSimAddress != "" {
76+
cfg.SimAddress = legacy.GrSimAddress
8377
}
8478
}
8579

@@ -103,7 +97,6 @@ func (c *Config) Save() error {
10397
func (c *Config) Update(
10498
visionPort, trackedPort, refereePort int,
10599
simAddress string,
106-
simPort int,
107100
autoBallPlacementEnabled bool,
108101
autoCenterAfterGoalEnabled bool,
109102
) {
@@ -122,9 +115,6 @@ func (c *Config) Update(
122115
if simAddress != "" {
123116
c.SimAddress = simAddress
124117
}
125-
if simPort > 0 {
126-
c.SimPort = simPort
127-
}
128118
c.AutoBallPlacementEnabled = autoBallPlacementEnabled
129119
c.AutoCenterAfterGoalEnabled = autoCenterAfterGoalEnabled
130120
}
@@ -145,9 +135,9 @@ func (c *Config) GetPorts() (vision, tracked, referee int) {
145135
return c.VisionPort, c.TrackedPort, c.RefereePort
146136
}
147137

148-
// GetSimAddress シミュレータのアドレスを取得
138+
// GetSimAddress シミュレータのアドレスを取得（ポートは固定 10300）
149139
func (c *Config) GetSimAddress() string {
150140
c.mu.RLock()
151141
defer c.mu.RUnlock()
152-
return fmt.Sprintf("%s:%d", c.SimAddress, c.SimPort)
142+
return fmt.Sprintf("%s:%d", c.SimAddress, SimPort)
153143
}

‎internal/config/handler.go‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ type ConfigUpdateRequest struct {
1212
TrackedPort int `json:"trackedPort"`
1313
RefereePort int `json:"refereePort"`
1414
SimAddress string `json:"simAddress"`
15-
SimPort int `json:"simPort"`
1615
AutoBallPlacementEnabled bool `json:"autoBallPlacementEnabled"`
1716
AutoCenterAfterGoalEnabled bool `json:"autoCenterAfterGoalEnabled"`
1817
}
@@ -61,7 +60,6 @@ func handleGetConfig(w http.ResponseWriter, cfg *Config) {
6160
trackedPort := cfg.TrackedPort
6261
refereePort := cfg.RefereePort
6362
simAddress := cfg.SimAddress
64-
simPort := cfg.SimPort
6563
autoBallPlacement := cfg.AutoBallPlacementEnabled
6664
autoCenterAfterGoal := cfg.AutoCenterAfterGoalEnabled
6765
cfg.mu.RUnlock()
@@ -74,7 +72,6 @@ func handleGetConfig(w http.ResponseWriter, cfg *Config) {
7472
"trackedIP": TrackedIP,
7573
"refereeIP": RefereeIP,
7674
"simAddress": simAddress,
77-
"simPort": simPort,
7875
"autoBallPlacementEnabled": autoBallPlacement,
7976
"autoCenterAfterGoalEnabled": autoCenterAfterGoal,
8077
}
@@ -100,19 +97,12 @@ func handleUpdateConfig(w http.ResponseWriter, r *http.Request, cfg *Config, res
10097
return
10198
}
10299

103-
// シミュレータポートの検証（0 は「変更なし」として許可）
104-
if req.SimPort < 0 || req.SimPort > 65535 {
105-
http.Error(w, "Invalid simulator port number", http.StatusBadRequest)
106-
return
107-
}
108-
109100
// 設定を更新
110101
cfg.Update(
111102
req.VisionPort,
112103
req.TrackedPort,
113104
req.RefereePort,
114105
req.SimAddress,
115-
req.SimPort,
116106
req.AutoBallPlacementEnabled,
117107
req.AutoCenterAfterGoalEnabled,
118108
)

0 commit comments

Comments
 (0)