Skip to content

Commit 264db33

Browse files
AnnatarHeclaude
andcommitted
refactor(encoding): replace msgpack with JSON encoding
- Switch from msgpack to JSON encoding in daemon sync handler - Replace msgpack with JSON in handshake service - Update tests to use JSON encoding - Simplifies serialization and improves compatibility 🤖 Generated with Claude Code (https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
1 parent 63020ad commit 264db33

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

daemon/handlers.sync.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package daemon
22

33
import (
44
"context"
5+
"encoding/json"
56
"log/slog"
67
"time"
78

@@ -74,7 +75,7 @@ func handlePubSubSync(ctx context.Context, socketMsgPayload interface{}) error {
7475
slog.Error("Failed to encrypt key", slog.Any("err", err))
7576
}
7677

77-
buf, err := msgpack.Marshal(payload)
78+
buf, err := json.Marshal(payload)
7879

7980
if err != nil {
8081
slog.Error("Failed to marshal payload", slog.Any("err", err))

model/handshake.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"time"
1313

1414
"github.com/sirupsen/logrus"
15-
"github.com/vmihailenco/msgpack/v5"
1615
"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
1716
)
1817

@@ -103,7 +102,7 @@ func (hs handshakeService) Init(ctx context.Context) (string, error) {
103102
OSVersion: sysInfo.Version,
104103
}
105104

106-
jsonData, err := msgpack.Marshal(data)
105+
jsonData, err := json.Marshal(data)
107106
if err != nil {
108107
logrus.Errorln(err)
109108
return "", err
@@ -130,7 +129,7 @@ func (hs handshakeService) Check(ctx context.Context, handshakeId string) (token
130129
EncodedID: handshakeId,
131130
}
132131

133-
jsonData, err := msgpack.Marshal(data)
132+
jsonData, err := json.Marshal(data)
134133
if err != nil {
135134
logrus.Errorln(err)
136135
return "", err

model/handshake_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ package model
22

33
import (
44
"context"
5+
"encoding/json"
56
"net/http"
67
"net/http/httptest"
78
"testing"
89

910
"github.com/stretchr/testify/assert"
1011
"github.com/stretchr/testify/suite"
11-
"github.com/vmihailenco/msgpack/v5"
1212
)
1313

1414
type handshakeTestSuite struct {
@@ -21,12 +21,12 @@ func (s *handshakeTestSuite) TestHandshakeInitSuccess() {
2121
// Verify request
2222
assert.Equal(t, "POST", r.Method)
2323
assert.Equal(t, "/api/v1/handshake/init", r.URL.Path)
24-
assert.Equal(t, "application/msgpack", r.Header.Get("Content-Type"))
24+
assert.Equal(t, "application/json", r.Header.Get("Content-Type"))
2525
assert.Contains(t, r.Header.Get("User-Agent"), "shelltimeCLI@")
2626

2727
// Decode request body
2828
var payload handshakeInitRequest
29-
err := msgpack.NewDecoder(r.Body).Decode(&payload)
29+
err := json.NewDecoder(r.Body).Decode(&payload)
3030
assert.NoError(t, err)
3131

3232
// Verify payload
@@ -74,11 +74,11 @@ func (s *handshakeTestSuite) TestHandshakeCheckWithToken() {
7474
// Verify request
7575
assert.Equal(t, "POST", r.Method)
7676
assert.Equal(t, "/api/v1/handshake/check", r.URL.Path)
77-
assert.Equal(t, "application/msgpack", r.Header.Get("Content-Type"))
77+
assert.Equal(t, "application/json", r.Header.Get("Content-Type"))
7878

7979
// Decode request body
8080
var payload handshakeCheckRequest
81-
err := msgpack.NewDecoder(r.Body).Decode(&payload)
81+
err := json.NewDecoder(r.Body).Decode(&payload)
8282
assert.NoError(t, err)
8383

8484
// Verify payload

0 commit comments

Comments
 (0)