pepepper/fluxer
1
0
Fork 0
mirror of https://github.com/fluxerapp/fluxer synced 2026-10-07 19:22:14 +09:00
Code Issues Packages Projects Releases Wiki Activity

perf(gateway): avoid per-key exceptions in guild data wire (#2167)

Browse Source
This commit is contained in:
Hampus
2026-08-30 22:45:47 +02:00
committed by GitHub
parent 02e614632f
commit b9ec0d5f53
2 changed files with 175 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fluxer_gateway/src/guild/guild_data_wire.erl
+25 -25
View File
@@ -28,21 +28,20 @@ payload(Value, _Path) ->
-spec payload_map_field(path(), term(), term(), map()) -> map().
payload_map_field(Path, Key, FieldValue, Acc) ->
case keep_payload_field(Key) of
true -> Acc#{payload_key(Key) => payload_field(Path, Key, FieldValue)};
KeyBinary = key_binary(Key),
case keep_payload_field(KeyBinary) of
true -> Acc#{payload_key(Key) => payload_field(Path, Key, KeyBinary, FieldValue)};
false -> Acc
end.
-spec keep_payload_field(term()) -> boolean().
keep_payload_field(Key) ->
not lists:member(key_binary(Key), [
<<"recipient_ids">>,
<<"role_index">>,
<<"channel_index">>,
<<"member_role_index">>,
<<"role_perms_cache">>,
<<"overwrite_perms_cache">>
]).
-spec keep_payload_field(binary() | undefined) -> boolean().
keep_payload_field(<<"recipient_ids">>) -> false;
keep_payload_field(<<"role_index">>) -> false;
keep_payload_field(<<"channel_index">>) -> false;
keep_payload_field(<<"member_role_index">>) -> false;
keep_payload_field(<<"role_perms_cache">>) -> false;
keep_payload_field(<<"overwrite_perms_cache">>) -> false;
keep_payload_field(_KeyBinary) -> true.
-spec payload_key(term()) -> term().
payload_key(Key) when is_integer(Key) ->
@@ -52,10 +51,10 @@ payload_key(Key) when is_atom(Key) ->
payload_key(Key) ->
Key.
-spec payload_field(path(), term(), term()) -> term().
payload_field(Path, Key, Value) ->
FieldPath = path_push(Key, Path),
case field_kind(Path, Key, Value) of
-spec payload_field(path(), term(), binary() | undefined, term()) -> term().
payload_field(Path, Key, KeyBinary, Value) ->
FieldPath = path_push(KeyBinary, Path),
case field_kind(Path, Key, KeyBinary, Value) of
snowflake -> payload_snowflake(Value, FieldPath);
permission -> payload_permission(Value, FieldPath);
snowflake_list -> payload_snowflake_list(Value, FieldPath);
@@ -87,11 +86,11 @@ payload_id_string(Value, _Path) when is_integer(Value) ->
payload_id_string(Value, Path) ->
payload(Value, Path).
-spec field_kind(path(), term(), term()) -> field_kind().
field_kind(Path, Key, Value) ->
-spec field_kind(path(), term(), binary() | undefined, term()) -> field_kind().
field_kind(Path, Key, KeyBinary, Value) ->
case is_snowflake_record_list_value(Key, Value) of
true -> snowflake_list;
false -> field_kind_binary(Path, key_binary(Key), Value)
false -> field_kind_binary(Path, KeyBinary, Value)
end.
-spec field_kind_binary(path(), binary() | undefined, term()) -> field_kind().
@@ -164,6 +163,8 @@ is_snowflake_record_list_value(Key, Value) ->
-spec key_is_snowflake(term()) -> boolean().
key_is_snowflake(Key) when is_integer(Key), Key > 0 ->
true;
key_is_snowflake(<<First, _/binary>>) when First < $1; First > $9 ->
false;
key_is_snowflake(Key) when is_binary(Key) ->
snowflake_id:is_valid(Key);
key_is_snowflake(_) ->
@@ -211,12 +212,11 @@ key_binary(Key) when is_atom(Key) ->
key_binary(_) ->
undefined.
-spec path_push(term(), path()) -> path().
path_push(Key, Path) ->
case key_binary(Key) of
undefined -> Path;
Binary -> [Binary | Path]
end.
-spec path_push(binary() | undefined, path()) -> path().
path_push(undefined, Path) ->
Path;
path_push(Binary, Path) ->
[Binary | Path].
-spec has_any_path([binary()], path()) -> boolean().
has_any_path(Keys, Path) ->
fluxer_gateway/test/guild_data_wire_tests.erl
+150
View File
@@ -127,5 +127,155 @@ payload_stringifies_snowflake_record_list_values_test() ->
Payload = payload(#{100 => [200, <<"300">>]}),
?assertEqual([<<"200">>, <<"300">>], maps:get(<<"100">>, Payload)).
payload_normalizes_presence_event_test() ->
?assertEqual(presence_event_wire(), payload(presence_event_data())).
payload_normalizes_message_event_test() ->
?assertEqual(message_event_wire(), payload(message_event_data())).
presence_event_data() ->
#{
<<"user">> => #{
<<"id">> => 100000000000000001,
<<"username">> => <<"ada">>,
<<"global_name">> => <<"Ada">>,
<<"avatar">> => null,
<<"public_flags">> => 64
},
<<"guild_id">> => 200000000000000002,
<<"status">> => <<"online">>,
<<"client_status">> => #{<<"desktop">> => <<"online">>, <<"mobile">> => <<"idle">>},
<<"activities">> => [
#{
<<"name">> => <<"Fluxer">>,
<<"type">> => 0,
<<"application_id">> => 300000000000000003,
<<"session_id">> => <<"3ab8fa1c">>,
<<"created_at">> => 1756500000000,
<<"party">> => #{<<"id">> => <<"party-a">>, <<"size">> => [2, 5]}
}
],
<<"roles">> => [400000000000000004, <<"500000000000000005">>],
<<"nick">> => <<"Ada">>,
<<"premium_since">> => null,
<<"member_role_index">> => #{400000000000000004 => true},
<<"role_perms_cache">> => #{400000000000000004 => 8},
600000000000000006 => [700000000000000007, <<"800000000000000008">>],
presence_seq => 42
}.
presence_event_wire() ->
#{
<<"user">> => #{
<<"id">> => <<"100000000000000001">>,
<<"username">> => <<"ada">>,
<<"global_name">> => <<"Ada">>,
<<"avatar">> => null,
<<"public_flags">> => 64
},
<<"guild_id">> => <<"200000000000000002">>,
<<"status">> => <<"online">>,
<<"client_status">> => #{<<"desktop">> => <<"online">>, <<"mobile">> => <<"idle">>},
<<"activities">> => [
#{
<<"name">> => <<"Fluxer">>,
<<"type">> => 0,
<<"application_id">> => <<"300000000000000003">>,
<<"session_id">> => <<"3ab8fa1c">>,
<<"created_at">> => 1756500000000,
<<"party">> => #{<<"id">> => <<"party-a">>, <<"size">> => [2, 5]}
}
],
<<"roles">> => [<<"400000000000000004">>, <<"500000000000000005">>],
<<"nick">> => <<"Ada">>,
<<"premium_since">> => null,
<<"600000000000000006">> => [<<"700000000000000007">>, <<"800000000000000008">>],
<<"presence_seq">> => 42
}.
message_event_data() ->
#{
<<"id">> => 900000000000000009,
<<"channel_id">> => 100000000000000010,
<<"guild_id">> => 200000000000000002,
<<"author">> => #{
<<"id">> => 100000000000000001,
<<"username">> => <<"ada">>,
<<"avatar">> => <<"a1b2c3">>,
<<"bot">> => false
},
<<"member">> => #{
<<"roles">> => [400000000000000004],
<<"joined_at">> => <<"2026-08-01T00:00:00Z">>,
<<"deaf">> => false
},
<<"content">> => <<"hey">>,
<<"timestamp">> => <<"2026-08-30T12:00:00Z">>,
<<"edited_timestamp">> => null,
<<"mention_everyone">> => false,
<<"mentions">> => [#{<<"id">> => 100000000000000001, <<"username">> => <<"ada">>}],
<<"mention_roles">> => [400000000000000004],
<<"attachments">> => [
#{
<<"id">> => 110000000000000011,
<<"filename">> => <<"shot.png">>,
<<"size">> => 20480
}
],
<<"embeds">> => [],
<<"type">> => 0,
<<"nonce">> => <<"120000000000000012">>,
<<"session_id">> => <<"3ab8fa1c">>,
<<"target_id">> => <<"ref-a">>,
<<"permissions">> => 137411140374081,
<<"recipient_ids">> => [100000000000000001],
<<"nicks">> => #{
<<"130000000000000013">> => <<"Ada">>, 170000000000000017 => <<"Grace">>
}
}.
message_event_wire() ->
#{
<<"id">> => <<"900000000000000009">>,
<<"channel_id">> => <<"100000000000000010">>,
<<"guild_id">> => <<"200000000000000002">>,
<<"author">> => #{
<<"id">> => <<"100000000000000001">>,
<<"username">> => <<"ada">>,
<<"avatar">> => <<"a1b2c3">>,
<<"bot">> => false
},
<<"member">> => #{
<<"roles">> => [<<"400000000000000004">>],
<<"joined_at">> => <<"2026-08-01T00:00:00Z">>,
<<"deaf">> => false
},
<<"content">> => <<"hey">>,
<<"timestamp">> => <<"2026-08-30T12:00:00Z">>,
<<"edited_timestamp">> => null,
<<"mention_everyone">> => false,
<<"mentions">> => [
#{<<"id">> => <<"100000000000000001">>, <<"username">> => <<"ada">>}
],
<<"mention_roles">> => [<<"400000000000000004">>],
<<"attachments">> => [
#{
<<"id">> => <<"110000000000000011">>,
<<"filename">> => <<"shot.png">>,
<<"size">> => 20480
}
],
<<"embeds">> => [],
<<"type">> => 0,
<<"nonce">> => <<"120000000000000012">>,
<<"session_id">> => <<"3ab8fa1c">>,
<<"target_id">> => <<"ref-a">>,
<<"permissions">> => <<"137411140374081">>,
<<"nicks">> => #{
<<"130000000000000013">> => <<"Ada">>,
<<"170000000000000017">> => <<"Grace">>
}
}.
payload(Data) ->
#{} = guild_data_wire:payload(Data).