Compare commits
No commits in common. "b871968f8cf07bc5d78f96275a247f1a586ab20b" and "25a775ee968853761eb1ece4010a941ccb5f5907" have entirely different histories.
b871968f8c
...
25a775ee96
2
priv/static/js/dist/webrtc.d.ts
vendored
2
priv/static/js/dist/webrtc.d.ts
vendored
@ -10,7 +10,5 @@
|
||||
* @module
|
||||
*/
|
||||
declare function main(): Promise<void>;
|
||||
type ws_msg = ["username", string] | ["users", Array<string>];
|
||||
declare function handle_ws_msg(message: ws_msg, roster_ul: HTMLUListElement, whoami: HTMLHeadingElement): void;
|
||||
declare function handle_join(init: HTMLDivElement, init_name: HTMLInputElement, peers: HTMLDivElement, ws: WebSocket): Promise<void>;
|
||||
declare function ws_send_json(ws: WebSocket, x: any): void;
|
||||
|
||||
27
priv/static/js/dist/webrtc.js
vendored
27
priv/static/js/dist/webrtc.js
vendored
@ -16,39 +16,18 @@ async function main() {
|
||||
let ws = new WebSocket('/ws/webrtc');
|
||||
// grab document elements
|
||||
let init = document.getElementById('init');
|
||||
let roster = document.getElementById('roster');
|
||||
let roster_ul = document.getElementById('roster-ul');
|
||||
let whoami = document.getElementById('whoami');
|
||||
let peers = document.getElementById('peers');
|
||||
let init_name = document.getElementById('init-name');
|
||||
let init_join = document.getElementById('init-join');
|
||||
// handle button click
|
||||
init_join.addEventListener('click', function () {
|
||||
handle_join(init, init_name, roster, ws);
|
||||
handle_join(init, init_name, peers, ws);
|
||||
});
|
||||
// handle message from ws
|
||||
ws.onopen = function (e) { console.log('ws open:', e); };
|
||||
ws.onclose = function (e) { console.warn('ws closed:', e); };
|
||||
ws.onerror = function (e) { console.error('ws error:', e); };
|
||||
ws.onmessage =
|
||||
function (e) {
|
||||
// console.log('ws message:', e.data);
|
||||
let message = JSON.parse(e.data);
|
||||
handle_ws_msg(message, roster_ul, whoami);
|
||||
};
|
||||
}
|
||||
function handle_ws_msg(message, roster_ul, whoami) {
|
||||
switch (message[0]) {
|
||||
case "username":
|
||||
whoami.innerText = 'Whoami: ' + message[1];
|
||||
break;
|
||||
case "users":
|
||||
for (let uname of message[1]) {
|
||||
let thisli = document.createElement('li');
|
||||
thisli.innerText = uname;
|
||||
roster_ul.appendChild(thisli);
|
||||
}
|
||||
break;
|
||||
}
|
||||
ws.onmessage = function (e) { console.log('ws message', e); };
|
||||
}
|
||||
async function handle_join(init, init_name, peers, ws) {
|
||||
console.log('connecting...');
|
||||
|
||||
2
priv/static/js/dist/webrtc.js.map
vendored
2
priv/static/js/dist/webrtc.js.map
vendored
@ -1 +1 @@
|
||||
{"version":3,"file":"webrtc.js","sourceRoot":"","sources":["../ts/webrtc.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;AAEH,IAAI,EAAE,CAAC;AAEP,KAAK,UACL,IAAI;IAIA,8BAA8B;IAC9B,IAAI,EAAE,GAAG,IAAI,SAAS,CAAC,YAAY,CAAC,CAAC;IAErC,yBAAyB;IACzB,IAAI,IAAI,GAAQ,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAwB,CAAC;IACvE,IAAI,MAAM,GAAM,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAsB,CAAC;IACvE,IAAI,SAAS,GAAG,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAqB,CAAC;IACzE,IAAI,MAAM,GAAM,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAA0B,CAAC;IAE3E,IAAI,SAAS,GAAG,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAqB,CAAC;IACzE,IAAI,SAAS,GAAG,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAsB,CAAC;IAE1E,sBAAsB;IACtB,SAAS,CAAC,gBAAgB,CAAC,OAAO,EAC9B;QACI,WAAW,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IAC7C,CAAC,CACJ,CAAC;IAEF,yBAAyB;IACzB,EAAE,CAAC,MAAM,GAAM,UAAS,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3D,EAAE,CAAC,OAAO,GAAK,UAAS,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9D,EAAE,CAAC,OAAO,GAAK,UAAS,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9D,EAAE,CAAC,SAAS;QACR,UAAS,CAAC;YACN,sCAAsC;YACtC,IAAI,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAW,CAAC;YAC3C,aAAa,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAC9C,CAAC,CAAC;AACV,CAAC;AAKD,SACA,aAAa,CACR,OAAkB,EAClB,SAA4B,EAC5B,MAA8B;IAG/B,QAAO,OAAO,CAAC,CAAC,CAAC,EAAE;QACf,KAAK,UAAU;YACX,MAAM,CAAC,SAAS,GAAG,UAAU,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YAC3C,MAAM;QACV,KAAK,OAAO;YACR,KAAK,IAAI,KAAK,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE;gBAC1B,IAAI,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;gBAC1C,MAAM,CAAC,SAAS,GAAG,KAAK,CAAC;gBACzB,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;aACjC;YACD,MAAM;KACb;AAEL,CAAC;AAID,KAAK,UACL,WAAW,CACN,IAA0B,EAC1B,SAA4B,EAC5B,KAA0B,EAC1B,EAAqB;IAGtB,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IAC7B,IAAI,SAAS,GAAW,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;IAC/C,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;IAEpC,YAAY,CAAC,EAAE,EAAE,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC;IAE1C,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;IACnB,KAAK,CAAC,MAAM,GAAG,KAAK,CAAC;AACzB,CAAC;AAGD,SACA,YAAY,CACP,EAAc,EACd,CAAQ;IAGT,IAAI,CAAC,GAAW,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;IAChD,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;IAE7B,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACf,CAAC"}
|
||||
{"version":3,"file":"webrtc.js","sourceRoot":"","sources":["../ts/webrtc.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;AAEH,IAAI,EAAE,CAAC;AAEP,KAAK,UACL,IAAI;IAIA,8BAA8B;IAC9B,IAAI,EAAE,GAAG,IAAI,SAAS,CAAC,YAAY,CAAC,CAAC;IAErC,yBAAyB;IACzB,IAAI,IAAI,GAAI,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAsB,CAAC;IACjE,IAAI,KAAK,GAAG,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAqB,CAAC;IAEjE,IAAI,SAAS,GAAG,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAqB,CAAC;IACzE,IAAI,SAAS,GAAG,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAsB,CAAC;IAE1E,sBAAsB;IACtB,SAAS,CAAC,gBAAgB,CAAC,OAAO,EAC9B;QACI,WAAW,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;IAC5C,CAAC,CACJ,CAAC;IAEF,yBAAyB;IACzB,EAAE,CAAC,MAAM,GAAM,UAAS,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3D,EAAE,CAAC,OAAO,GAAK,UAAS,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9D,EAAE,CAAC,OAAO,GAAK,UAAS,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9D,EAAE,CAAC,SAAS,GAAG,UAAS,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACjE,CAAC;AAED,KAAK,UACL,WAAW,CACN,IAA0B,EAC1B,SAA4B,EAC5B,KAA0B,EAC1B,EAAqB;IAGtB,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IAC7B,IAAI,SAAS,GAAW,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;IAC/C,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;IAEpC,YAAY,CAAC,EAAE,EAAE,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC;IAE1C,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;IACnB,KAAK,CAAC,MAAM,GAAG,KAAK,CAAC;AACzB,CAAC;AAGD,SACA,YAAY,CACP,EAAc,EACd,CAAQ;IAGT,IAAI,CAAC,GAAW,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;IAChD,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;IAE7B,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACf,CAAC"}
|
||||
@ -22,9 +22,7 @@ main
|
||||
|
||||
// grab document elements
|
||||
let init = document.getElementById('init') as HTMLDivElement;
|
||||
let roster = document.getElementById('roster') as HTMLDivElement;
|
||||
let roster_ul = document.getElementById('roster-ul') as HTMLUListElement;
|
||||
let whoami = document.getElementById('whoami') as HTMLHeadingElement;
|
||||
let peers = document.getElementById('peers') as HTMLDivElement;
|
||||
|
||||
let init_name = document.getElementById('init-name') as HTMLInputElement;
|
||||
let init_join = document.getElementById('init-join') as HTMLButtonElement;
|
||||
@ -32,7 +30,7 @@ main
|
||||
// handle button click
|
||||
init_join.addEventListener('click',
|
||||
function() {
|
||||
handle_join(init, init_name, roster, ws);
|
||||
handle_join(init, init_name, peers, ws);
|
||||
}
|
||||
);
|
||||
|
||||
@ -40,41 +38,9 @@ main
|
||||
ws.onopen = function(e) { console.log('ws open:', e); };
|
||||
ws.onclose = function(e) { console.warn('ws closed:', e); };
|
||||
ws.onerror = function(e) { console.error('ws error:', e); };
|
||||
ws.onmessage =
|
||||
function(e) {
|
||||
// console.log('ws message:', e.data);
|
||||
let message = JSON.parse(e.data) as ws_msg;
|
||||
handle_ws_msg(message, roster_ul, whoami);
|
||||
};
|
||||
ws.onmessage = function(e) { console.log('ws message', e); };
|
||||
}
|
||||
|
||||
type ws_msg = ["username", string]
|
||||
| ["users", Array<string>];
|
||||
|
||||
function
|
||||
handle_ws_msg
|
||||
(message : ws_msg,
|
||||
roster_ul : HTMLUListElement,
|
||||
whoami : HTMLHeadingElement)
|
||||
: void
|
||||
{
|
||||
switch(message[0]) {
|
||||
case "username":
|
||||
whoami.innerText = 'Whoami: ' + message[1];
|
||||
break;
|
||||
case "users":
|
||||
for (let uname of message[1]) {
|
||||
let thisli = document.createElement('li');
|
||||
thisli.innerText = uname;
|
||||
roster_ul.appendChild(thisli);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
async function
|
||||
handle_join
|
||||
(init : HTMLDivElement,
|
||||
|
||||
@ -22,12 +22,10 @@
|
||||
</div>
|
||||
|
||||
|
||||
<div id="roster" hidden>
|
||||
<h2 id="whoami">Whoami: </h2>
|
||||
<div id="peers" hidden>
|
||||
<h1>Peers</h1>
|
||||
|
||||
<h2>Roster</h2>
|
||||
|
||||
<ul id="roster-ul"></ul>
|
||||
<ul id="peers-ul"></ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@ -23,12 +23,6 @@ start_link() ->
|
||||
|
||||
init([]) ->
|
||||
RestartStrategy = {one_for_one, 1, 60},
|
||||
WebRTC = {fd_httpd_webrtc,
|
||||
{fd_httpd_webrtc, start_link, []},
|
||||
permanent,
|
||||
5000,
|
||||
worker,
|
||||
[fd_httpd_webrtc]},
|
||||
FileCache = {fd_httpd_sfc,
|
||||
{fd_httpd_sfc, start_link, []},
|
||||
permanent,
|
||||
@ -41,6 +35,5 @@ init([]) ->
|
||||
5000,
|
||||
supervisor,
|
||||
[fd_httpd_clients]},
|
||||
Children = [WebRTC, FileCache, Clients],
|
||||
%Children = [FileCache, Clients],
|
||||
Children = [FileCache, Clients],
|
||||
{ok, {RestartStrategy, Children}}.
|
||||
|
||||
@ -293,9 +293,9 @@ respond_static(Sock, not_found) ->
|
||||
%% ------------------------------
|
||||
|
||||
-record(rs,
|
||||
{socket :: gen_tcp:socket(),
|
||||
received = <<>> :: binary(),
|
||||
username = undefined :: undefined | string()}).
|
||||
{received = <<>> :: binary(),
|
||||
username = undefined :: undefined | string(),
|
||||
peers = undefined :: undefined | [string()]}).
|
||||
|
||||
-type webrtc_state() :: #rs{}.
|
||||
|
||||
@ -304,7 +304,7 @@ ws_webrtc(Sock, Request, Received) ->
|
||||
case qhl_ws:handshake(Request) of
|
||||
{ok, Response} ->
|
||||
fd_httpd_utils:respond(Sock, Response),
|
||||
ws_webrtc_loop(#rs{socket = Sock, received = Received});
|
||||
ws_webrtc_loop(Sock, #rs{received = Received});
|
||||
Error ->
|
||||
tell("ws_webrtc: error: ~tp", [Error]),
|
||||
fd_httpd_utils:http_err(Sock, 400)
|
||||
@ -318,75 +318,20 @@ ws_webrtc(Sock, Request, Received) ->
|
||||
|
||||
-define(WEBRTC_TIMEOUT, 30*qhl_ws:min()).
|
||||
|
||||
|
||||
|
||||
-spec ws_webrtc_loop(webrtc_state()) -> no_return().
|
||||
|
||||
%% first thing is to get username
|
||||
ws_webrtc_loop(State = #rs{socket = Socket,
|
||||
received = Recv,
|
||||
ws_webrtc_loop(Socket, State = #rs{received = Recv,
|
||||
username = undefined}) ->
|
||||
{ok, ["username", Username], NewRecv} =
|
||||
qhl_ws:recv_json(Socket, Recv, ?WEBRTC_TIMEOUT),
|
||||
%Foo = qhl_ws:recv_json(Socket, Recv, ?WEBRTC_TIMEOUT),
|
||||
%tell("~p recv_json: ~p", [self(), Foo]),
|
||||
%error(ur_mom);
|
||||
{ok, ["username", Username], NewRecv} = qhl_ws:recv_json(Socket, Recv, ?WEBRTC_TIMEOUT),
|
||||
tell("~p ws_webrtc_loop: request username: ~p", [self(), Username]),
|
||||
{ok, ActualUsername} = fd_httpd_webrtc:join(Username),
|
||||
ok = qhl_ws:send_json(Socket, ["username", ActualUsername]),
|
||||
NewState = State#rs{received = NewRecv,
|
||||
username = ActualUsername},
|
||||
ws_webrtc_loop(NewState);
|
||||
% we have no tcp bytes waiting to be parsed
|
||||
ws_webrtc_loop(State = #rs{socket = Socket,
|
||||
received = <<>>}) ->
|
||||
ok = inet:setopts(Socket, [{active, once}]),
|
||||
receive
|
||||
{tcp, Socket, Message} ->
|
||||
NewState = State#rs{received = Message},
|
||||
ws_webrtc_loop(NewState);
|
||||
{webrtc, Message} ->
|
||||
NewState = ws_webrtc_handle_webrtc(Message, State),
|
||||
ws_webrtc_loop(NewState);
|
||||
{tcp_closed, Socket} ->
|
||||
ok = tell("~p Socket closed, retiring.~n", [self()]),
|
||||
exit(normal)
|
||||
end;
|
||||
% we have TCP bytes sitting and waiting to be parsed
|
||||
ws_webrtc_loop(State = #rs{socket = Socket,
|
||||
received = R}) ->
|
||||
{ok, Message, NewR} = qhl_ws:recv_json(Socket, R, 5000),
|
||||
NewState = ws_webrtc_handle_json(Message, State#rs{received = NewR}),
|
||||
ws_webrtc_loop(NewState).
|
||||
|
||||
|
||||
|
||||
-spec ws_webrtc_handle_webrtc(Message, State) -> NewState
|
||||
when Message :: any(),
|
||||
State :: webrtc_state(),
|
||||
NewState :: webrtc_state().
|
||||
% @private handle a message from the server
|
||||
|
||||
ws_webrtc_handle_webrtc(Message, State = #rs{socket = Sock}) ->
|
||||
tell("~p received message from webrtc: ~p", [self(), Message]),
|
||||
NewState =
|
||||
case Message of
|
||||
{users, Users} ->
|
||||
ok = qhl_ws:send_json(Sock, ["users", Users]),
|
||||
State;
|
||||
_ ->
|
||||
tell("~p unknown webrtc message: ~p", [self, Message])
|
||||
end,
|
||||
NewState.
|
||||
|
||||
|
||||
|
||||
-spec ws_webrtc_handle_json(Message, State) -> NewState
|
||||
when Message :: zj:value(),
|
||||
State :: webrtc_state(),
|
||||
NewState :: webrtc_state().
|
||||
% @private handle a message from the client
|
||||
|
||||
ws_webrtc_handle_json(Message, State) ->
|
||||
tell("~p received json message from client: ~p", [self(), Message]),
|
||||
State.
|
||||
username = Username},
|
||||
ws_webrtc_loop(Socket, NewState);
|
||||
ws_webrtc_loop(Socket, State = _) ->
|
||||
tell("~p ws_webrtc_loop nyi state: ~p", [self(), State]),
|
||||
error(nyi).
|
||||
|
||||
|
||||
%% ------------------------------
|
||||
|
||||
@ -1,174 +0,0 @@
|
||||
% @doc webrtc peer pool
|
||||
-module(fd_httpd_webrtc).
|
||||
|
||||
-behavior(gen_server).
|
||||
|
||||
%% api (caller context)
|
||||
-export([
|
||||
join/1
|
||||
]).
|
||||
|
||||
% startup/gen_server callbacks
|
||||
-export([
|
||||
% caller context
|
||||
start_link/0,
|
||||
% process context
|
||||
init/1, handle_call/3, handle_cast/2, handle_info/2,
|
||||
code_change/3, terminate/2
|
||||
]).
|
||||
|
||||
-include("$zx_include/zx_logger.hrl").
|
||||
|
||||
|
||||
-record(u,
|
||||
{pid :: pid(),
|
||||
username :: string()}).
|
||||
|
||||
-type user() :: #u{}.
|
||||
|
||||
-record(s,
|
||||
{users = [] :: [user()]}).
|
||||
|
||||
-type state() :: #s{}.
|
||||
|
||||
|
||||
%%-----------------------------------------------------------------------------
|
||||
%% caller context
|
||||
%%-----------------------------------------------------------------------------
|
||||
|
||||
|
||||
start_link() ->
|
||||
gen_server:start_link({local, ?MODULE}, ?MODULE, none, []).
|
||||
|
||||
|
||||
|
||||
-spec join(Username :: string()) -> {ok, ActualUsername :: string()} | {error, any()}.
|
||||
|
||||
join(Username) ->
|
||||
gen_server:call(?MODULE, {join, Username}).
|
||||
|
||||
|
||||
|
||||
%%-----------------------------------------------------------------------------
|
||||
%% process context
|
||||
%%-----------------------------------------------------------------------------
|
||||
|
||||
%% gen_server callbacks
|
||||
|
||||
init(none) ->
|
||||
tell("starting fd_httpd_webrtc", []),
|
||||
InitState = #s{},
|
||||
{ok, InitState}.
|
||||
|
||||
|
||||
handle_call({join, Username}, _From = {PID, _Tag}, State) ->
|
||||
{Reply, NewState} = do_join(Username, PID, State),
|
||||
{reply, Reply, NewState};
|
||||
handle_call(Unexpected, From, State) ->
|
||||
tell("~tp: unexpected call from ~tp: ~tp", [?MODULE, Unexpected, From]),
|
||||
{noreply, State}.
|
||||
|
||||
|
||||
handle_cast(Unexpected, State) ->
|
||||
tell("~tp: unexpected cast: ~tp", [?MODULE, Unexpected]),
|
||||
{noreply, State}.
|
||||
|
||||
|
||||
handle_info({'DOWN', _Ref, process, PID, _Reason}, State) ->
|
||||
NewState = do_down(PID, State),
|
||||
{noreply, NewState};
|
||||
handle_info(Unexpected, State) ->
|
||||
tell("~tp: unexpected info: ~tp", [?MODULE, Unexpected]),
|
||||
{noreply, State}.
|
||||
|
||||
|
||||
code_change(_, State, _) ->
|
||||
{ok, State}.
|
||||
|
||||
terminate(_, _) ->
|
||||
ok.
|
||||
|
||||
|
||||
%%---------------------
|
||||
%% doers
|
||||
%%---------------------
|
||||
|
||||
-spec do_join(Username, PID, State) -> {Reply, NewState}
|
||||
when Username :: string(),
|
||||
PID :: pid(),
|
||||
State :: state(),
|
||||
Reply :: {ok, ActualUsername :: string()}
|
||||
| {error, any()},
|
||||
NewState :: state().
|
||||
% @private join a user to a pool
|
||||
|
||||
do_join(Username, PID, State = #s{users = Users}) ->
|
||||
% see if pid is already there
|
||||
case lists:keymember(PID, #u.pid, Users) of
|
||||
true -> {error, already_joined};
|
||||
false -> do_join2(Username, PID, State)
|
||||
end.
|
||||
|
||||
do_join2(Username, PID, State = #s{users = Users}) ->
|
||||
monitor(process, PID),
|
||||
ActualUsername = unique_username(Username, Users),
|
||||
NewUser = #u{pid = PID, username = ActualUsername},
|
||||
NewRoster = usort([NewUser | Users]),
|
||||
NewState = State#s{users = NewRoster},
|
||||
ok = gossip_roster(NewState),
|
||||
{{ok, ActualUsername}, NewState}.
|
||||
|
||||
usort(Users) ->
|
||||
lists:keysort(#u.username, Users).
|
||||
|
||||
unique_username(Username, Users) ->
|
||||
tell("~p unique_username(~p, ~p)", [?MODULE, Username, Users]),
|
||||
case lists:keymember(Username, #u.username, Users) of
|
||||
true -> unique_username(Username, 1, Users);
|
||||
false -> Username
|
||||
end.
|
||||
|
||||
unique_username(Username, N, Users) ->
|
||||
tell("~p unique_username(~p, ~p ~p)", [?MODULE, Username, N, Users]),
|
||||
U = Username ++ integer_to_list(N),
|
||||
case lists:keymember(U, #u.username, Users) of
|
||||
true -> unique_username(Username, N + 1, Users);
|
||||
false -> U
|
||||
end.
|
||||
|
||||
|
||||
|
||||
-spec do_down(PID, State) -> NewState
|
||||
when PID :: pid(),
|
||||
State :: state(),
|
||||
NewState :: state().
|
||||
% @private handle a user dying
|
||||
|
||||
do_down(PID, State = #s{users = Users}) ->
|
||||
% remove from users
|
||||
NewUsers = usort(lists:keydelete(PID, #u.pid, Users)),
|
||||
NewState = State#s{users = NewUsers},
|
||||
% broadcast username
|
||||
ok = gossip_roster(State),
|
||||
NewState.
|
||||
|
||||
|
||||
|
||||
-spec gossip_roster(state()) -> ok.
|
||||
% @private gossip the roster to everyone
|
||||
|
||||
gossip_roster(State = #s{users = Users}) ->
|
||||
Usernames = [Username || #u{username = Username} <- Users],
|
||||
gossip({users, Usernames}, State).
|
||||
|
||||
|
||||
|
||||
-spec gossip(any(), state()) -> ok.
|
||||
% @private gossip a message to everyone
|
||||
|
||||
gossip(Message, #s{users = Users}) ->
|
||||
GossipTo =
|
||||
fun(#u{pid = PID}) ->
|
||||
PID ! {webrtc, Message}
|
||||
end,
|
||||
lists:foreach(GossipTo, Users).
|
||||
Loading…
x
Reference in New Issue
Block a user