Use http.ServeMux instead of chi.Mux #86
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
methane
reviewed
Apr 1, 2024
server/lobby/service/api.go
Outdated
| number = int32(n) | ||
| func (vars JoinVars) roomNumber() (int32, bool) { | ||
| v := vars.r.PathValue("roomNumber") | ||
| if !numRegexp.Match([]byte(v)) { |
There was a problem hiding this comment.
Suggested change
| if !numRegexp.Match([]byte(v)) { | |
| if !numRegexp.MatchString(v) { |
There was a problem hiding this comment.
ParseIntは結構入力に対して厳しいので、マイナスになってないか以外のチェックはParseIntのエラーに頼っても良いかもしれません。
server/game/repository_test.go
Outdated
|
|
||
| for id, valid := range tests { | ||
| if IsValidRoomId(id) != valid { | ||
| t.Fatalf("IsValidRoomId(%v) wants %v", id, valid) |
There was a problem hiding this comment.
これは継続可能なエラーなので、FatalfじゃなくてErrorfでいいかもしれません。
テストがfailするときも、どのテストケースの結果が何になるのかのリストが出た方がバグ修正しやすいので。
There was a problem hiding this comment.
他のところも直せるところありそうですね。
いったんここだけ直しておいて、他のところは別PRで。
| ) | ||
|
|
||
| func init() { | ||
| initQueries() | ||
| seed, _ := crand.Int(crand.Reader, big.NewInt(math.MaxInt64)) | ||
| randsrc = rand.New(rand.NewSource(seed.Int64())) | ||
|
|
||
| rerid = regexp.MustCompile(idPattern) |
There was a problem hiding this comment.
Suggested change
| rerid = regexp.MustCompile(idPattern) | |
| rerid = regexp.MustCompile("^[0-9a-f]+$") |
|
@methane |
methane
approved these changes
Apr 1, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Go 1.22から、標準net/httpでもHTTPメソッドの指定とパスパラメータの抽出ができるようになりました。
今までchi（それ以前はgorilla/mux）を使ってやっていましたが、wsnet2ではそんなに高度なことはやっていないので、標準net/httpに書き換えて依存を減らしてみました。
ただ、パスパラメータ部分の正規表現マッチングはnet/httpではできないので、ハンドラ側でチェックする形に変更しました。
これによりマッチしないときのレスポンスが404から400に変わるケースがありますが、正しいクライアントならそもそも起こらないので問題ないはずです。