json output error on unknown tags, fixes #57

spali · Apr 17, 2024 · 52222f7 · 52222f7
1 parent 1cf03c5
commit 52222f7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/cmd/e3dc/json_output_test.go b/cmd/e3dc/json_output_test.go
@@ -154,6 +154,11 @@ func TestJSONSimpleMessage_MarshalJSON(t *testing.T) {
 			[]byte(`{"EMS_MANUAL_CHARGE_LASTSTART":"1970-01-01T00:00:00Z"}`),
 			false,
 		},
+		{"Unknown Tag to String key",
+			JSONMessage{25166461: 0},
+			[]byte(`{"25166461":0}`),
+			false,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

diff --git a/rscp/tag_functions.go b/rscp/tag_functions.go
@@ -23,7 +23,7 @@ func (t Tag) MarshalJSON() ([]byte, error) {
 	if t.IsATag() {
 		return json.Marshal(t.String())
 	}
-	return []byte(fmt.Sprintf("%d", t)), nil
+	return []byte(fmt.Sprintf("\"%d\"", t)), nil
 }
 
 // UnmarshalJSON implements the json.Unmarshaler interface for Tag