jeena/GGS
Archived
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Added new python test file, and made __echo respond with users JSVM

Browse source
This commit is contained in:
Jonatan Pålsson 2011-02-01 01:40:21 +01:00
parent 2c083dd3dd
commit 30cebd1c0d
6 changed files with 64 additions and 14853 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/ggs_protocol.erl
View file

@ -20,6 +20,9 @@ parse(Data) ->
{hello};
[RefID, "__define",_, JavaScript ] ->
{ok, you_said_define};
[RefID, "__echo", Length, Msg ] ->
{Ref, _} = string:to_integer(RefID),
{echo, Ref, Length, Msg};
[RefID, Command, _, Parameter ] ->
{cmd, Command, Parameter};
Other ->

26
src/ggs_server.erl
View file

@ -101,17 +101,20 @@ do_JSCall(Socket, Data, State) ->
Ret = js_runner:call(JSVM, "userCommand",
[list_to_binary(Command),
list_to_binary(Parameter)]),
send(Socket, "JS says: ", Ret),
send(Socket, "RefID", "JS says: ", Ret),
[];
% Set the new state to the reference generated, and JSVM associated
{hello} ->
Client = make_ref(),
Client = getRef(),
send(Socket, Client, "__ok_hello"),
{Client, JSVM};
{echo, RefID, _, MSG} ->
send(Socket, RefID, "Your VM is ", getJSVM(RefID, State)),
[];
% Set the new state to []
Other ->
io:format("Got '~p'", [Other]),
send(Socket, "__error"),
send(Socket, "RefID", "__error"),
[]
end,
% Return the new state
@ -119,9 +122,18 @@ do_JSCall(Socket, Data, State) ->
%%-----------------------------------------------------
%% Helpers
%%-----------------------------------------------------
getRef() ->
{A1,A2,A3} = now(),
random:seed(A1, A2, A3),
random:uniform(1000).
send(Socket, String) ->
gen_tcp:send(Socket, io_lib:fwrite("~p~n", [String])).
getJSVM(RefID, State) ->
VMs = State#state.client_vm_map,
{value, {_,VM}} = lists:keysearch(RefID, 1, VMs),
VM.
send(Socket, String1, String2) ->
gen_tcp:send(Socket, io_lib:fwrite("~p ~p~n", [String1, String2])).
send(Socket, RefID, String) ->
gen_tcp:send(Socket, io_lib:fwrite("~p ~p~n", [RefID,String])).
send(Socket, RefID, String1, String2) ->
gen_tcp:send(Socket, io_lib:fwrite("~p ~p ~p~n", [RefID, String1, String2])).