oiupoyt/discordo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor: use encoding/json/v2

Browse source
This commit is contained in:
ayn2op 2026-08-21 19:59:40 -04:00
parent 36a4c05dd4
commit cf6c343fd5
3 changed files with 64 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal/http/headers.go
View file

@ -2,7 +2,7 @@ package http
import (
"encoding/base64"
"encoding/json"
json "encoding/json/v2"
"log/slog"
stdHttp "net/http"

87
internal/ui/login/qr/msg.go
View file

@ -6,7 +6,7 @@ import (
"crypto/sha256"
"crypto/x509"
"encoding/base64"
"encoding/json"
json "encoding/json/v2"
"errors"
"strings"
"time"
@ -90,60 +90,39 @@ func listen(conn *websocket.Conn) tview.Cmd {
return errMsg(err)
}
var payload struct {
Op string `json:"op"`
}
if err := json.Unmarshal(data, &payload); err != nil {
return errMsg(err)
}
return decodeMessage(data)
}
}
switch payload.Op {
case "hello":
var payload struct {
HeartbeatInterval int `json:"heartbeat_interval"`
TimeoutMS int `json:"timeout_ms"`
}
if err := json.Unmarshal(data, &payload); err != nil {
return errMsg(err)
}
return helloMsg{heartbeatInterval: payload.HeartbeatInterval, timeoutMS: payload.TimeoutMS}
case "nonce_proof":
var payload struct {
EncryptedNonce string `json:"encrypted_nonce"`
}
if err := json.Unmarshal(data, &payload); err != nil {
return errMsg(err)
}
return nonceProofMsg{encryptedNonce: payload.EncryptedNonce}
case "pending_remote_init":
var payload struct {
Fingerprint string `json:"fingerprint"`
}
if err := json.Unmarshal(data, &payload); err != nil {
return errMsg(err)
}
return pendingRemoteInitMsg{fingerprint: payload.Fingerprint}
case "pending_ticket":
var payload struct {
EncryptedUserPayload string `json:"encrypted_user_payload"`
}
if err := json.Unmarshal(data, &payload); err != nil {
return errMsg(err)
}
return pendingTicketMsg{encryptedUserPayload: payload.EncryptedUserPayload}
case "cancel":
return cancelMsg{}
case "pending_login":
var payload struct {
Ticket string `json:"ticket"`
}
if err := json.Unmarshal(data, &payload); err != nil {
return errMsg(err)
}
return pendingLoginMsg{ticket: payload.Ticket}
default:
return nil
}
func decodeMessage(data []byte) tview.Msg {
var payload struct {
Op string `json:"op"`
HeartbeatInterval int `json:"heartbeat_interval"`
TimeoutMS int `json:"timeout_ms"`
EncryptedNonce string `json:"encrypted_nonce"`
Fingerprint string `json:"fingerprint"`
EncryptedUserPayload string `json:"encrypted_user_payload"`
Ticket string `json:"ticket"`
}
if err := json.Unmarshal(data, &payload); err != nil {
return errMsg(err)
}
switch payload.Op {
case "hello":
return helloMsg{heartbeatInterval: payload.HeartbeatInterval, timeoutMS: payload.TimeoutMS}
case "nonce_proof":
return nonceProofMsg{encryptedNonce: payload.EncryptedNonce}
case "pending_remote_init":
return pendingRemoteInitMsg{fingerprint: payload.Fingerprint}
case "pending_ticket":
return pendingTicketMsg{encryptedUserPayload: payload.EncryptedUserPayload}
case "cancel":
return cancelMsg{}
case "pending_login":
return pendingLoginMsg{ticket: payload.Ticket}
default:
return nil
}
}

30
internal/ui/login/qr/msg_test.go Normal file
View file

@ -0,0 +1,30 @@
package qr
import "testing"
func TestDecodeMessage(t *testing.T) {
tests := []struct {
data string
want any
}{
{`{"op":"hello","heartbeat_interval":100,"timeout_ms":200}`, helloMsg{heartbeatInterval: 100, timeoutMS: 200}},
{`{"op":"nonce_proof","encrypted_nonce":"nonce"}`, nonceProofMsg{encryptedNonce: "nonce"}},
{`{"op":"pending_remote_init","fingerprint":"fingerprint"}`, pendingRemoteInitMsg{fingerprint: "fingerprint"}},
{`{"op":"pending_ticket","encrypted_user_payload":"payload"}`, pendingTicketMsg{encryptedUserPayload: "payload"}},
{`{"op":"cancel"}`, cancelMsg{}},
{`{"op":"pending_login","ticket":"ticket"}`, pendingLoginMsg{ticket: "ticket"}},
{`{"op":"unknown"}`, nil},
}
for _, test := range tests {
if got := decodeMessage([]byte(test.data)); got != test.want {
t.Errorf("decodeMessage(%s) = %#v, want %#v", test.data, got, test.want)
}
}
}
func TestDecodeMessageRejectsDuplicateNames(t *testing.T) {
if _, ok := decodeMessage([]byte(`{"op":"cancel","op":"hello"}`)).(errMsg); !ok {
t.Fatal("duplicate name was accepted")
}
}