From 894cba6c0277671bca74de6d17e2d5381034f119 Mon Sep 17 00:00:00 2001
From: anlicheng <244108715@qq.com>
Date: Fri, 14 Nov 2025 15:32:46 +0800
Subject: [PATCH] fix message codec

---
 apps/efka/include/message.hrl           |  8 --------
 apps/efka/src/message/message_codec.erl | 16 +++-------------
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/apps/efka/include/message.hrl b/apps/efka/include/message.hrl
index 804148c..5bc6e2b 100644
--- a/apps/efka/include/message.hrl
+++ b/apps/efka/include/message.hrl
@@ -74,18 +74,10 @@
 }).
 
 -record(data, {
-    service_id :: binary(),
-    device_uuid :: binary(),
     route_key :: binary(),
     metric :: binary()
 }).
 
--record(event, {
-    service_id :: binary(),
-    event_type :: integer(),
-    params :: binary()
-}).
-
 -record(task_event_stream, {
     task_id :: integer(),
     type :: binary(),
diff --git a/apps/efka/src/message/message_codec.erl b/apps/efka/src/message/message_codec.erl
index 643242c..3de252d 100644
--- a/apps/efka/src/message/message_codec.erl
+++ b/apps/efka/src/message/message_codec.erl
@@ -59,19 +59,11 @@ encode0(#jsonrpc_request{method = Method, params = Params}) ->
     iolist_to_binary([
         marshal(?Bytes, ReqBody)
     ]);
-encode0(#data{service_id = ServiceId, device_uuid = DeviceUUID, route_key = RouteKey, metric = Metric}) ->
+encode0(#data{route_key = RouteKey, metric = Metric}) ->
     iolist_to_binary([
-        marshal(?Bytes, ServiceId),
-        marshal(?Bytes, DeviceUUID),
         marshal(?Bytes, RouteKey),
         marshal(?Bytes, Metric)
     ]);
-encode0(#event{service_id = ServiceId, event_type = EventType, params = Params}) ->
-    iolist_to_binary([
-        marshal(?Bytes, ServiceId),
-        marshal(?I32, EventType),
-        marshal(?Bytes, Params)
-    ]);
 encode0(#task_event_stream{task_id = TaskId, type = Type, stream = Stream}) ->
     iolist_to_binary([
         marshal(?I32, TaskId),
@@ -107,10 +99,8 @@ decode0(?MESSAGE_AUTH_REPLY, [Code, Payload]) ->
 decode0(?MESSAGE_JSONRPC_REQUEST, [ReqBody]) ->
     #{<<"method">> := Method, <<"params">> := Params} = erlang:binary_to_term(ReqBody),
     {ok, #jsonrpc_request{method = Method, params = Params}};
-decode0(?MESSAGE_DATA, [ServiceId, DeviceUUID, RouteKey, Metric]) ->
-    {ok, #data{service_id = ServiceId, device_uuid = DeviceUUID, route_key = RouteKey, metric = Metric}};
-decode0(?MESSAGE_EVENT, [ServiceId, EventType, Params]) ->
-    {ok, #event{service_id = ServiceId, event_type = EventType, params = Params}};
+decode0(?MESSAGE_DATA, [RouteKey, Metric]) ->
+    {ok, #data{route_key = RouteKey, metric = Metric}};
 decode0(?MESSAGE_EVENT_STREAM, [TaskId, Type, Stream]) ->
     {ok, #task_event_stream{task_id = TaskId, type = Type, stream = Stream}};
 decode0(_, _) ->