cryptix/caberl - Change YWCRGWVDIMCPXBQFM23MKCYZCXJJSD733NJEPB6WUU4G4BSREILAC

decode() based on type and encode a first msg

Created by Henry on October 13, 2023

YWCRGWVDIMCPXBQFM23MKCYZCXJJSD733NJEPB6WUU4G4BSREILAC

Dependencies

In channels

main

Change contents

Replacement in test/cable_basic_SUITE.erl at line 11 [4.22]

B:BD[3.88] → [3.88:173]

    [{header, Header},  {ttl, 1}, {hashes, Hashes}] = wire:decode_post_request(Bin),

[3.88]

[5.88]

    {ok, [Header,  [{ttl, 1}, {hashes, Hashes}]]} = wire:decode(Bin),

Replacement in test/cable_basic_SUITE.erl at line 20 [4.22]

B:BD[6.542] → [5.145:235]

    [{header, Header}, {ttl, 1}, {cancelid, CancelId}] = wire:decode_cancel_request(Bin),

[6.542]

[5.235]

    {ok, [Header, [ {ttl, 1}, {cancelid, CancelId}]]} = wire:decode(Bin),

Replacement in test/cable_basic_SUITE.erl at line 27 [4.22]

B:BD[6.1174] → [6.1174:1233]

B:BD[6.1233] → [5.357:390]

    Decoded = wire:decode_channel_time_range_request(Bin),
    [{header, Header}, {ttl, 1},

[6.1174]

[6.1268]

    {ok, Decoded} = wire:decode(Bin),
    [Header, [ {ttl, 1},

Replacement in test/cable_basic_SUITE.erl at line 33 [4.22]
B:BD[6.1379] → [6.1379:1396]
```
    ] = Decoded,
```
[6.1379]
[5.391]
```
    ]] = Decoded,
```

Replacement in test/cable_basic_SUITE.erl at line 43 [4.22]

B:BD[5.768] → [5.768:855]

    Decoded = wire:decode_channel_state_request(Bin),
    [{header, Header}, {ttl, 1},

[5.768]

[5.855]

    {ok, Decoded} = wire:decode(Bin),
    [Header, [ {ttl, 1},

Replacement in test/cable_basic_SUITE.erl at line 47 [4.22]
B:BD[5.908] → [5.908:925]
```
    ] = Decoded,
```
[5.908]
[5.925]
```
    ]] = Decoded,
```

Replacement in test/cable_basic_SUITE.erl at line 55 [4.22]

B:BD[5.1180] → [5.1180:1266]

    Decoded = wire:decode_channel_list_request(Bin),
    [{header, Header}, {ttl, 1},

[5.1180]

[5.1266]

    {ok, Decoded} = wire:decode(Bin),
    [Header, [ {ttl, 1},

Replacement in test/cable_basic_SUITE.erl at line 59 [4.22]
B:BD[5.1307] → [7.2:19]
```
    ] = Decoded,
```
[5.1307]
[3.414]
```
    ]] = Decoded,
```

Replacement in test/cable_basic_SUITE.erl at line 65 [4.22]

B:BD[3.562] → [3.562:671]

    Decoded = wire:decode_hash_response(Bin),
    [ {header, Header}
    , {hashes, Hashes}
    ] = Decoded,

[3.562]

[3.671]

    {ok, Decoded} = wire:decode(Bin),
    [ Header, [ {hashes, Hashes} ]] = Decoded,

Insertion in test/cable_basic_SUITE.erl at line 71 [4.22]

[3.872]

[7.385]


%% multiple_in_one_test() ->
%%     [{binary, Bin1}, _] = examples:hash_response(),
%%     [{binary, Bin2}, _] = examples:post_request(),
%%     {multiple, Msgs} = wire:decode(<<Bin1/binary, Bin2/binary>>),
%%     ?assertEqual(2, length(Msgs)).

Insertion in test/cable_basic_SUITE.erl at line 78 [4.22]

[7.386]

%% full circle
encode_channel_state_req_test() ->
    TH = make_test_header(),
    Msg = wire:encode_channel_state_request(TH, "Foo", true),
    {ok, [Header, Body]} = wire:decode(Msg),
    [{requestId, Req}, {circuitId, Circ}, _] = TH,
    ?assertEqual(Req, proplists:get_value(requestId, Header)),
    ?assertEqual(Circ, proplists:get_value(circuitId, Header)),
    ?assertEqual(<<"Foo">>, proplists:get_value(channel, Body)),
    ?assertEqual(1, proplists:get_value(future, Body)).
make_test_header() ->
    [{requestId, crypto:strong_rand_bytes(4)},
     {circuitId, crypto:strong_rand_bytes(4)},
     {ttl, rand:uniform(20)}].

Replacement in test/cable_basic_SUITE.erl at line 96 [4.22]

B:BD[7.474] → [7.474:564]

∅:D[7.564] → [5.1307:1324]

B:BD[5.1307] → [5.1307:1324]

    Decoded = wire:decode_post_response(Bin),
    [ {header, Header}
    , {posts, Posts}
    ] = Decoded,

[7.474]

[3.873]

    {ok, Decoded} = wire:decode(Bin),
    [ Header, [ {posts, Posts} ]] = Decoded,

Replacement in test/cable_basic_SUITE.erl at line 104 [4.22]

B:BD[7.704] → [7.704:851]

    Decoded = wire:decode_channel_list_response(Bin),
    [ {header, Header}
    , {channels, ["default", "dev", "introduction"]}
    ] = Decoded,

[7.704]

[3.933]

    {ok, Decoded} = wire:decode(Bin),
    [ Header, [ {channels, ["default", "dev", "introduction"]} ]] = Decoded,

Insertion in test/cable_basic_SUITE.erl at line 108 [4.22]
[7.887]
[7.887]
Insertion in test/cable_basic_SUITE.erl at line 110 [4.22]
[7.888]
[7.888]
```
%% move these to seperate test file
```
Replacement in test/cable_basic_SUITE.erl at line 198 [4.22]
B:BD[5.1382] → [5.1382:1417]
```
assert_header(Header, TestObj) -> 
```
[5.1382]
[7.3720]
```
assert_header(Header, TestObj) ->
```

Replacement in apps/cable/src/wire.erl at line 7 [4.5336]

B:BD[4.5353] → [3.1067:1306]

-export([decode_post_request/1, decode_hash_response/1, decode_cancel_request/1, decode_channel_time_range_request/1, decode_channel_state_request/1, decode_channel_list_request/1, decode_post_response/1, decode_channel_list_response/1]).

[4.5353]

[4.5390]

-export([decode/1]).
%-export([decode_post_request/1, decode_hash_response/1, decode_cancel_request/1, decode_channel_time_range_request/1, decode_channel_state_request/1, decode_channel_list_request/1, decode_post_response/1, decode_channel_list_response/1]).
-export([encode_channel_state_request/3]).

Insertion in apps/cable/src/wire.erl at line 16 [4.5336]

[4.5436]


encode_channel_state_request(Header, Channel, Future) when is_list(Channel), is_boolean(Future) ->
    [{requestId, RequestId}, {circuitId, CircuitId}, {ttl, TTL}] = Header,
    ChannelLen = encode_varint(length(Channel)),
    ChannelBin = list_to_binary(Channel),
    FutureBin = encode_bool(Future),
    TTLbin = encode_varint(TTL),
    Msg = iolist_to_binary(
            [<<5>>, CircuitId, RequestId, TTLbin,
           ChannelLen, ChannelBin, FutureBin]),
    MsgLen = encode_varint(byte_size(Msg)),
    <<MsgLen/binary, Msg/binary>>.
encode_bool(V) when is_boolean(V) ->
    case V of
        true -> <<1>>;
        false -> <<0>>
    end.
decode(Data) ->
    {ok, [Header, Payload]} = decode_header(Data),
    Body = case proplists:get_value(msgType, Header) of
        0 -> decode_hash_response(Payload);
        1 -> decode_post_response(Payload);
        2 -> decode_post_request(Payload);
        3 -> decode_cancel_request(Payload);
        4 -> decode_channel_time_range_request(Payload);
        5 -> decode_channel_state_request(Payload);
        6 -> decode_channel_list_request(Payload);
        7 -> decode_channel_list_response(Payload)
    end,
    {ok, [Header, Body]}.

Replacement in apps/cable/src/wire.erl at line 51 [4.5336]

B:BD[4.5511] → [4.5511:5623]

B:BD[4.5623] → [8.10:135]

∅:D[8.135] → [4.5768:5775]

B:BD[4.5768] → [4.5768:5775]

B:BD[4.5775] → [3.1309:1363]

    {MsgType, Rest2} = decode_varint(Rest),
    << CircuitId:4/binary, ReqId:4/binary, Rest3/binary >> = Rest2,
    [ {msgLen, MsgLen}
    , {msgType, MsgType}
    , {circuitId, CircuitId}
    , {requestId, ReqId}
    , {payload, Rest3}
    ].
% TODO: assert message type on all concrete decoders

[4.5511]

[4.5775]

    case MsgLen =:= byte_size(Rest) of
        true ->
            {MsgType, Rest2} = decode_varint(Rest),
            << CircuitId:4/binary, ReqId:4/binary, Rest3/binary >> = Rest2,
            Header = [ {msgLen, MsgLen}
                     , {msgType, MsgType}
                     , {circuitId, CircuitId}
                     , {requestId, ReqId}],
            {ok, [Header, Rest3]};
        false ->
            % we currently assume the passed data is a full message
            % but a client _could_ send multiple in a single (tcp) write
            erlang:error("TODO: implement proper message chunking")
    end.

Replacement in apps/cable/src/wire.erl at line 66 [4.5336]
B:BD[4.5776] → [6.2129:2159]
B:BD[6.2159] → [9.572:606]
∅:D[9.606] → [3.1407:1459]
B:BD[3.1407] → [3.1407:1459]
```
decode_hash_response(Data) ->
    Header = decode_header(Data),
    Payload = proplists:get_value(payload, Header),
```
[4.5776]
[3.1459]
```
decode_hash_response(Payload) ->
```
Replacement in apps/cable/src/wire.erl at line 70 [4.5336]
B:BD[3.1599] → [3.1599:1617]
```
        false -> 
```
[3.1599]
[3.1617]
```
        false ->
```

Replacement in apps/cable/src/wire.erl at line 74 [4.5336]

B:BD[3.1792] → [3.1792:1883]

        [ {header, proplists:delete(payload, Header)}
        , {hashes, Hashes}
        ]

[3.1792]

[3.1883]

        [ {hashes, Hashes} ]

Replacement in apps/cable/src/wire.erl at line 77 [4.5336]
B:BD[3.1893] → [3.1893:1922]
B:BD[3.1922] → [9.607:641]
∅:D[9.641] → [6.2202:2254]
B:BD[6.2202] → [6.2202:2254]
```
decode_post_request(Data) ->
    Header = decode_header(Data),
    Payload = proplists:get_value(payload, Header),
```
[3.1893]
[7.4271]
```
decode_post_request(Payload) ->
```
Replacement in apps/cable/src/wire.erl at line 81 [4.5336]
B:BD[6.2435] → [7.4380:4398]
```
        false -> 
```
[6.2435]
[3.1923]
```
        false ->
```

Replacement in apps/cable/src/wire.erl at line 85 [4.5336]

B:BD[8.152] → [8.152:227]

        [ {header, proplists:delete(payload, Header)}
        , {ttl, Ttl}

[8.152]

[8.227]

        [ {ttl, Ttl}

Replacement in apps/cable/src/wire.erl at line 90 [4.5336]
B:BD[6.2636] → [6.2636:2667]
B:BD[6.2667] → [9.642:676]
∅:D[9.676] → [6.2710:2762]
B:BD[6.2710] → [6.2710:2762]
```
decode_cancel_request(Data) ->
    Header = decode_header(Data),
    Payload = proplists:get_value(payload, Header),
```
[6.2636]
[6.2762]
```
decode_cancel_request(Payload) ->
```
Replacement in apps/cable/src/wire.erl at line 92 [4.5336]
B:BD[6.2821] → [8.255:322]
```
    [ {header, proplists:delete(payload, Header)}
    , {ttl, Ttl}
```
[6.2821]
[8.322]
```
    [ {ttl, Ttl}
```
Replacement in apps/cable/src/wire.erl at line 96 [4.5336]
B:BD[6.2929] → [6.2929:2972]
B:BD[6.2972] → [9.677:711]
∅:D[9.711] → [6.3015:3067]
B:BD[6.3015] → [6.3015:3067]
```
decode_channel_time_range_request(Data) ->
    Header = decode_header(Data),
    Payload = proplists:get_value(payload, Header),
```
[6.2929]
[5.1706]
```
decode_channel_time_range_request(Payload) ->
```
Replacement in apps/cable/src/wire.erl at line 100 [4.5336]
∅:D[5.1886] → [6.3347:3414]
B:BD[6.3347] → [6.3347:3414]
```
    [ {header, proplists:delete(payload, Header)}
    , {ttl, Ttl}
```
[5.1886]
[6.3414]
```
    [ {ttl, Ttl}
```
Replacement in apps/cable/src/wire.erl at line 107 [4.5336]
B:BD[6.3522] → [5.1887:1925]
B:BD[5.1925] → [9.712:746]
∅:D[9.746] → [5.1968:2020]
B:BD[5.1968] → [5.1968:2020]
```
decode_channel_state_request(Data) ->
    Header = decode_header(Data),
    Payload = proplists:get_value(payload, Header),
```
[6.3522]
[5.2020]
```
decode_channel_state_request(Payload) ->
```
Replacement in apps/cable/src/wire.erl at line 111 [4.5336]
B:BD[5.2177] → [5.2177:2244]
```
    [ {header, proplists:delete(payload, Header)}
    , {ttl, Ttl}
```
[5.2177]
[5.2244]
```
    [ {ttl, Ttl}
```
Replacement in apps/cable/src/wire.erl at line 116 [4.5336]
B:BD[5.2300] → [5.2300:2337]
B:BD[5.2337] → [9.747:781]
∅:D[9.781] → [5.2380:2432]
B:BD[5.2380] → [5.2380:2432]
```
decode_channel_list_request(Data) ->
    Header = decode_header(Data),
    Payload = proplists:get_value(payload, Header),
```
[5.2300]
[5.2432]
```
decode_channel_list_request(Payload) ->
```
Replacement in apps/cable/src/wire.erl at line 118 [4.5336]
B:BD[5.2493] → [5.2493:2560]
```
    [ {header, proplists:delete(payload, Header)}
    , {ttl, Ttl}
```
[5.2493]
[5.2560]
```
    [ {ttl, Ttl}
```

Replacement in apps/cable/src/wire.erl at line 123 [4.5336]

B:BD[7.4568] → [7.4568:4598]

B:BD[7.4598] → [9.782:816]

∅:D[9.816] → [7.4641:4790]

B:BD[7.4641] → [7.4641:4790]

decode_post_response(Data) ->
    Header = decode_header(Data),
    Payload = proplists:get_value(payload, Header),
    [ {header, proplists:delete(payload, Header)}
    , {posts, decode_list_of_strings(Payload)}

[7.4568]

[7.4790]

decode_post_response(Payload) ->
    [ {posts, decode_list_of_strings(Payload)}

Replacement in apps/cable/src/wire.erl at line 127 [4.5336]

B:BD[7.4798] → [7.4798:4836]

B:BD[7.4836] → [9.817:851]

∅:D[9.851] → [7.4879:5031]

B:BD[7.4879] → [7.4879:5031]

decode_channel_list_response(Data) ->
    Header = decode_header(Data),
    Payload = proplists:get_value(payload, Header),
    [ {header, proplists:delete(payload, Header)}
    , {channels, decode_list_of_strings(Payload)}

[7.4798]

[5.2604]

decode_channel_list_response(Payload) ->
    [ {channels, decode_list_of_strings(Payload)}

Replacement in apps/cable/src/wire.erl at line 148 [4.5336]
B:BD[5.2706] → [5.2706:2739]
```
decode_varints(Data, 0, Acc) -> 
```
[5.2696]
[5.2739]
```
decode_varints(Data, 0, Acc) ->
```
Replacement in apps/cable/src/wire.erl at line 150 [4.5336]
B:BD[5.2758] → [5.2758:2803]
```
decode_varints(Data, N, Acc) when N >= 0 -> 
```
[5.2758]
[5.2803]
```
decode_varints(Data, N, Acc) when N >= 0 ->
```

Insertion in apps/cable/src/peer.erl at line 4 [9.854]

[9.906]

%% TODO: make this a gen_server
%% calls:
%% - list connections
%% - dial(peer)

Replacement in apps/cable/src/peer.erl at line 31 [9.854]

B:BD[9.1700] → [2.57:81]

∅:D[2.81] → [9.1753:1849]

B:BD[9.1753] → [9.1753:1849]

  Db = db:start_link(),
  Handler = spawn(fun() -> handle_messages() end),
  State = #state{handler= Handler, db = Db},

[9.1700]

[9.1849]

  Db = db:start_link(cabal),
  % TODO: supervise this handler
  Handler = spawn(fun() -> handle_messages(Db) end),
  State = #state{handler=Handler, db=Db},

Replacement in apps/cable/src/peer.erl at line 38 [9.854]
B:BD[9.1904] → [9.1904:1940]
```
  {ok, Sock} = gen_tcp:accept(Lis),
```
[9.1904]
[9.1940]
```
  {ok, Sock} = gen_tcp:accept(Lis, infinity),
```

Insertion in apps/cable/src/peer.erl at line 47 [9.854]

[9.2269]

  % init connection
  send_channel_state_request(Conn, "default", false),
  % listen for incoming messages

Replacement in apps/cable/src/peer.erl at line 52 [9.854]

B:BD[9.2319] → [9.2319:2396]

      Msg = wire:decode_header(Data),
      Handler ! {incoming, Conn, Msg},

[9.2319]

[9.2396]

      Result = wire:decode(Data),
      % not sure if it's good to produce this many messages but i'm fine with it for now
      case Result of
          {ok, Msg} ->
              Handler ! {incoming, Conn, Msg};
          {multiple, Msgs} -> lists:foreach(fun(Msg) ->
              Handler ! {incoming, conn, Msg} end, Msgs)
      end,

Insertion in apps/cable/src/peer.erl at line 65 [9.854]

[9.2509]

handle_messages(Db) ->
    receive
        {incoming, Conn, [Header, Body]} ->
            [_, {msgType, MsgType}, _, {requestId, ReqIdBin}, _] = Header,
            ReqId = hex:bin_to_hexstr(ReqIdBin),
            io:format("Received RequestId:~p from ~p~n", [ReqId, Conn]),
            io:format("Type:~p - Body:~p~n", [MsgType, Body]),
            handle_messages(Db)
    end.

Replacement in apps/cable/src/peer.erl at line 75 [9.854]

B:BD[9.2510] → [9.2510:2714]

handle_messages() ->
  receive
    {incoming, Conn, Msg} ->
      Type = proplists:get_value(msgType, Msg),
      io:format("Received MsgType: ~p from ~p~n", [Type, Conn]),
      handle_messages()
  end.

[9.2510]

% TODO: track request id
send_channel_state_request(Peer, Channel, Future) ->
    Header = [{requestId, crypto:strong_rand_bytes(4)},
              {circuitId,  <<0,0,0,0>>},
              {ttl, 5}],
    Message = wire:encode_channel_state_request(Header, Channel, Future),
    gen_tcp:send(Peer, Message).
% H = spawn(fun() -> peer:start_server('localhost', 13333) end).

Replacement in apps/cable/src/db.erl at line 11 [2.84]
B:BD[2.326] → [2.326:358]
```
    [{dbpath, Path}, _] = Args,
```
[2.326]
[2.358]
```
    Path = proplists:get_value(dbPath, Args),
```

Replacement in apps/cable/src/db.erl at line 20 [2.84]

B:BD[2.518] → [2.518:596]

    gen_server:start_link({local, cabaldb}, ?MODULE, [{dbpath, DbPath}], []).

[2.518]

[2.596]

    gen_server:start_link({local, cabaldb}, ?MODULE, [{dbPath, DbPath}], []).

Insertion in apps/cable/src/db.erl at line 43 [2.84]

[2.1271]

    sqlite3:close(Db),
    ok;
terminate(killed, _State = [{sql, Db, _}]) ->
    io:format("DB Process killed!"),

decode() based on type and encode a first msg

Dependencies

In channels

Change contents

Replacement in test/cable_basic_SUITE.erl at line 11 [4.22]

Replacement in test/cable_basic_SUITE.erl at line 20 [4.22]

Replacement in test/cable_basic_SUITE.erl at line 27 [4.22]

Replacement in test/cable_basic_SUITE.erl at line 33 [4.22]

Replacement in test/cable_basic_SUITE.erl at line 43 [4.22]

Replacement in test/cable_basic_SUITE.erl at line 47 [4.22]

Replacement in test/cable_basic_SUITE.erl at line 55 [4.22]

Replacement in test/cable_basic_SUITE.erl at line 59 [4.22]

Replacement in test/cable_basic_SUITE.erl at line 65 [4.22]

Insertion in test/cable_basic_SUITE.erl at line 71 [4.22]

Insertion in test/cable_basic_SUITE.erl at line 78 [4.22]

Replacement in test/cable_basic_SUITE.erl at line 96 [4.22]

Replacement in test/cable_basic_SUITE.erl at line 104 [4.22]

Insertion in test/cable_basic_SUITE.erl at line 108 [4.22]

Insertion in test/cable_basic_SUITE.erl at line 110 [4.22]

Replacement in test/cable_basic_SUITE.erl at line 198 [4.22]

Replacement in apps/cable/src/wire.erl at line 7 [4.5336]

Insertion in apps/cable/src/wire.erl at line 16 [4.5336]

Replacement in apps/cable/src/wire.erl at line 51 [4.5336]

Replacement in apps/cable/src/wire.erl at line 66 [4.5336]

Replacement in apps/cable/src/wire.erl at line 70 [4.5336]

Replacement in apps/cable/src/wire.erl at line 74 [4.5336]

Replacement in apps/cable/src/wire.erl at line 77 [4.5336]

Replacement in apps/cable/src/wire.erl at line 81 [4.5336]

Replacement in apps/cable/src/wire.erl at line 85 [4.5336]

Replacement in apps/cable/src/wire.erl at line 90 [4.5336]

Replacement in apps/cable/src/wire.erl at line 92 [4.5336]

Replacement in apps/cable/src/wire.erl at line 96 [4.5336]

Replacement in apps/cable/src/wire.erl at line 100 [4.5336]

Replacement in apps/cable/src/wire.erl at line 107 [4.5336]

Replacement in apps/cable/src/wire.erl at line 111 [4.5336]

Replacement in apps/cable/src/wire.erl at line 116 [4.5336]

Replacement in apps/cable/src/wire.erl at line 118 [4.5336]