Now most of GGSChat uses the GGS protocol both ways
This commit is contained in:
parent
9ff48a90b3
commit
6986bc269f
4 changed files with 64 additions and 17 deletions
|
@ -44,17 +44,23 @@ loop(Table) ->
|
|||
do_stuff(Command, Args, PlayerToken, Table) ->
|
||||
case Command of
|
||||
"greet" ->
|
||||
ggs_table:notify_player(Table, PlayerToken, server, "Hello there!\n");
|
||||
ggs_table:notify_player(Table, PlayerToken, server, {"chat", "Hello there!\n"});
|
||||
"chat" ->
|
||||
Nick = ggs_db:getItem(Table, nicks, PlayerToken),
|
||||
ggs_table:notify_all_players(Table, "<"++Nick++"> "++ Args ++ "\n");
|
||||
case ggs_db:getItem(Table, nicks, PlayerToken) of
|
||||
{error} ->
|
||||
Nick = "Noname";
|
||||
Other ->
|
||||
Nick = Other
|
||||
end,
|
||||
ggs_table:notify_all_players(Table, {"chat", "<"++Nick++"> "++ Args ++ "\n"});
|
||||
"uname" ->
|
||||
Uname = os:cmd("uname -a"),
|
||||
ggs_table:notify_player(Table, PlayerToken, server, Uname);
|
||||
ggs_table:notify_player(Table, PlayerToken, server, {"chat", Uname});
|
||||
"lusers" ->
|
||||
{ok, Players} = ggs_table:get_player_list(Table),
|
||||
Nicks = lists:map(fun (P) -> ggs_db:getItem(Table, nicks, P) end, Players),
|
||||
ggs_table:notify_player(Table, PlayerToken, server,io_lib:format("LUSERS ~p\n",[Nicks]));
|
||||
ggs_table:notify_player(Table, PlayerToken, server,
|
||||
{"lusers", io_lib:format("~p\n",[Nicks])});
|
||||
"nick" ->
|
||||
ggs_db:setItem(Table,nicks,PlayerToken,Args),
|
||||
io:format("Changing nickname of ~p to ~p.", [PlayerToken, Args]);
|
||||
|
|
|
@ -26,12 +26,12 @@ start_link(Socket) ->
|
|||
TableStatus = ggs_coordinator:join_table(1337),
|
||||
case TableStatus of
|
||||
{ok, Table} ->
|
||||
notify(self(), self(), Token),
|
||||
notify(self(), self(), {"hello", Token}),
|
||||
loop(#pl_state{socket = Socket, token = Token, table = Table});
|
||||
{error, no_such_table} ->
|
||||
ggs_coordinator:create_table({force, 1337}),
|
||||
{ok, Table} = ggs_coordinator:join_table(1337),
|
||||
notify(self(), self(), Token),
|
||||
notify(self(), self(), {"hello", Token}),
|
||||
loop(#pl_state{socket = Socket, token = Token, table = Table})
|
||||
end.
|
||||
|
||||
|
@ -40,7 +40,10 @@ start_link(Socket) ->
|
|||
%% @spec notify(Player::Pid(), From::Pid(),
|
||||
%% {Command::String(), Message::string()}) -> ok
|
||||
notify(Player, From, Message) ->
|
||||
Player ! {notify, From, Message}.
|
||||
erlang:display(Message),
|
||||
{Cmd, Data} = Message,
|
||||
Parsed = ggs_protocol:create_message(Cmd, "text","text", Data),
|
||||
Player ! {notify, From, Parsed}.
|
||||
|
||||
%% @doc Get the player token uniquely representing the player.
|
||||
%% @spec get_token() -> string()
|
||||
|
@ -60,7 +63,9 @@ loop(#pl_state{token = _Token, socket = Socket, table = Table} = State) ->
|
|||
receive
|
||||
{tcp, Socket, Data} -> % Just echo for now..
|
||||
io:format("Parsing via protocol module..~n"),
|
||||
erlang:display(Data),
|
||||
Parsed = ggs_protocol:parse(Data),
|
||||
erlang:display(Parsed),
|
||||
self() ! Parsed,
|
||||
loop(State);
|
||||
{notify, _From, Message} ->
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
-module(ggs_protocol).
|
||||
-export([parse/1, getToken/1]).
|
||||
-export([parse/1, getToken/1, create_message/4]).
|
||||
|
||||
%% API Functions
|
||||
parse(Data) ->
|
||||
|
@ -14,6 +14,18 @@ getToken(Parsed) ->
|
|||
false
|
||||
end.
|
||||
|
||||
create_message(Cmd, Enc, Acc, Data) ->
|
||||
Length = integer_to_list(string:len(Data)),
|
||||
Msg = "Client-Command: " ++ Cmd ++ "\n" ++
|
||||
"Client-Encoding: " ++ Enc ++ "\n" ++
|
||||
"Content-Size: " ++ Length ++ "\n" ++
|
||||
"GGS-Version: 1.0\n" ++
|
||||
"Accept: " ++ Acc ++ "\n" ++
|
||||
"\n" ++
|
||||
Data,
|
||||
Msg.
|
||||
|
||||
|
||||
%% Internal helpers
|
||||
do_parse(Data, ParsedMessage) ->
|
||||
NewLinePos = string:chr(Data, $\n),
|
||||
|
|
Reference in a new issue