finished code surgery

patient is comatose and is missing both testicles and eyeballs but is legally
alive

priv/static/js/dist/libfewd.js.map

@@ -1 +1 @@
-{"version":3,"file":"libfewd.js","sourceRoot":"","sources":["../ts/libfewd.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACH,WAAW,EACX,qBAAqB,EACxB,CAAC;AAGF,SACA,WAAW,CACN,gBAAmC,EACnC,cAAsC,EACtC,UAAyB;IAG1B,+DAA+D;IAC/D,IAAI,gBAAgB,CAAC,OAAO,EAAE,CAAC;QAC3B,IAAI,aAAa,GAAW,cAAc,CAAC,YAAY,CAAC;QACxD,sCAAsC;QACtC,IAAI,aAAa,GAAG,UAAU;YAC1B,cAAc,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC;;YAE3D,cAAc,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC;IAChE,CAAC;AACL,CAAC;AAGD,SACA,qBAAqB,CAChB,gBAAmC,EACnC,cAAsC;IAGvC,IAAI,gBAAgB,CAAC,OAAO,EAAE,CAAC;QAC3B,mBAAmB;QACnB,cAAc,CAAC,SAAS,GAAG,cAAc,CAAC,YAAY,CAAC;IAC3D,CAAC;AACL,CAAC"}
+{"version":3,"file":"libfewd.js","sourceRoot":"","sources":["../ts/libfewd.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACH,WAAW,EACX,qBAAqB,EACxB,CAAC;AAGF,SACA,WAAW,CACN,gBAAmC,EACnC,cAAsC,EACtC,UAAyB;IAG1B,+DAA+D;IAC/D,IAAI,gBAAgB,CAAC,OAAO,EAAE;QAC1B,IAAI,aAAa,GAAW,cAAc,CAAC,YAAY,CAAC;QACxD,sCAAsC;QACtC,IAAI,aAAa,GAAG,UAAU;YAC1B,cAAc,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC;;YAE3D,cAAc,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC;KAC/D;AACL,CAAC;AAGD,SACA,qBAAqB,CAChB,gBAAmC,EACnC,cAAsC;IAGvC,IAAI,gBAAgB,CAAC,OAAO,EAAE;QAC1B,mBAAmB;QACnB,cAAc,CAAC,SAAS,GAAG,cAAc,CAAC,YAAY,CAAC;KAC1D;AACL,CAAC"}

priv/static/js/dist/webrtc.d.ts

@@ -10,7 +10,6 @@
  * @module
  */
 declare function main(): Promise<void>;
-type ws_msg = ["username", string] | ["users", Array<string>];
+type ws_msg = ["join", string] | ["down", string];
-declare function handle_ws_msg(message: ws_msg, roster_ul: HTMLUListElement, whoami: HTMLHeadingElement): void;
+declare function handle_ws_msg(message: ws_msg): 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;

priv/static/js/dist/webrtc.js

@@ -13,50 +13,26 @@
 main();
 async function main() {
     // start websocket immediately
-    let ws = new WebSocket('/ws/webrtc');
+    let ws;
-    // 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 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);
+        init.hidden = true;
+        ws = new WebSocket('/ws/webrtc');
+        ws.onopen = function (e) { console.log('ws open'); };
+        ws.onclose = function (e) { console.warn('ws closed'); };
+        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);
+            };
     });
-    // 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) {
+function handle_ws_msg(message) {
-    switch (message[0]) {
+    console.log('message from server:', message);
-        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, init_name, peers, ws) {
-    console.log('connecting...');
-    let user_name = init_name.value.trim();
-    console.log('username:', user_name);
-    ws_send_json(ws, ['username', user_name]);
-    init.hidden = true;
-    peers.hidden = false;
 }
 function ws_send_json(ws, x) {
     let s = JSON.stringify(x, undefined, 4);

priv/static/js/dist/webrtc.js.map

@@ -1 +1 @@
-{"version":3,"file":"webrtc.js","sourceRoot":"","sources":["../ts/webrtc.ts"],"names":[],"mappings":"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"}
+{"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,EAAa,CAAC;IAClB,IAAI,IAAI,GAAG,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAmB,CAAC;IAC7D,IAAI,SAAS,GAAG,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAsB,CAAC;IAE1E,sBAAsB;IACtB,SAAS,CAAC,gBAAgB,CAAC,OAAO,EAC9B;QACI,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,EAAE,GAAG,IAAI,SAAS,CAAC,YAAY,CAAC,CAAC;QACjC,EAAE,CAAC,MAAM,GAAM,UAAS,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;QACvD,EAAE,CAAC,OAAO,GAAK,UAAS,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1D,EAAE,CAAC,OAAO,GAAK,UAAS,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9D,EAAE,CAAC,SAAS;YACR,UAAS,CAAC;gBACN,sCAAsC;gBACtC,IAAI,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAW,CAAC;gBAC3C,aAAa,CAAC,OAAO,CAAC,CAAC;YAC3B,CAAC,CAAC;IACV,CAAC,CACJ,CAAC;AACN,CAAC;AAKD,SACA,aAAa,CACR,OAAe;IAGhB,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC;AACjD,CAAC;AAID,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"}

priv/static/js/dist/wfc.js.map

@@ -1 +1 @@
-{"version":3,"file":"wfc.js","sourceRoot":"","sources":["../ts/wfc.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"wfc.js","sourceRoot":"","sources":["../ts/wfc.ts"],"names":[],"mappings":"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"}

priv/static/js/ts/webrtc.ts

@@ -18,82 +18,41 @@ main
     : Promise<void>
 {
     // start websocket immediately
-    let ws = new WebSocket('/ws/webrtc');
+    let ws: WebSocket;
-
+    let init = document.getElementById('init') as HTMLDivElement;
-    // 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 init_name = document.getElementById('init-name') as HTMLInputElement;
     let init_join = document.getElementById('init-join') as HTMLButtonElement;
 
     // handle button click
     init_join.addEventListener('click',
         function() {
-            handle_join(init, init_name, roster, ws);
+            init.hidden = true;
+            ws = new WebSocket('/ws/webrtc');
+            ws.onopen    = function(e) { console.log('ws open'); };
+            ws.onclose   = function(e) { console.warn('ws closed'); };
+            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);
+                };
         }
     );
-
-    // 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) as ws_msg;
-            handle_ws_msg(message, roster_ul, whoami);
-        };
 }
 
-type ws_msg = ["username", string]
+type ws_msg = ["join", string]
-            | ["users", Array<string>];
+            | ["down", string];
 
 function
 handle_ws_msg
-    (message   : ws_msg,
+    (message: ws_msg)
-     roster_ul : HTMLUListElement,
-     whoami    : HTMLHeadingElement)
     : void
 {
-    switch(message[0]) {
+    console.log('message from server:', message);
-        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,
-     init_name : HTMLInputElement,
-     peers     : HTMLDivElement,
-     ws        : WebSocket)
-    : Promise<void>
-{
-    console.log('connecting...');
-    let user_name: string = init_name.value.trim();
-    console.log('username:', user_name);
-
-    ws_send_json(ws, ['username', user_name]);
-
-    init.hidden = true;
-    peers.hidden = false;
-}
-
-
 function
 ws_send_json
     (ws : WebSocket,

priv/static/webrtc.html

@@ -16,14 +16,12 @@
         <h1 class="content-title">FEWD: webrtc demo</h1>
 
         <div id="init">
-            <label for="init-name">username:</label>
-            <input autofocus id="init-name" type="text" value='alice'>
             <button id="init-join">connect</button>
         </div>
 
 
         <div id="roster" hidden>
-            <h2 id="whoami">Whoami: </h2>
+            <h2>Whoami: <span id="whoami"></span></h2>
 
             <h2>Roster</h2>
 

src/fd_httpd_client.erl

@@ -141,14 +141,13 @@ loop(Parent, Debug, State = #s{socket = Socket, next = Next0}) ->
                     %%
                     %% also loop/3 should be loop/1, because we need to pass
                     %% the state down the callchains
-                    Next2 = unfuck_retarded_qhl_bullshit(Next1),
+                    Next2 =
                         case Next1 of
                             none -> <<>>;
                             Bin  -> Bin
                         end,
-                    Next3 = handle_request(Socket, Req, Next2),
+                    NewState = State#s{next = Next2},
-                    NewState = State#s{next = Next3},
+                    handle_request(Req, Parent, Debug, NewState);
-                    loop(Parent, Debug, NewState);
                 Error ->
                     %% should trigger bad request
                     tell(error, "~p QHL parse error: ~tp", [?LINE, Error]),
@@ -221,41 +220,44 @@ system_replace_state(StateFun, State) ->
 
 %%% http request handling
 
--spec handle_request(Sock, Request, Received) -> NewReceived
+-spec handle_request(Request, Parent, Debug, State) -> no_return()
-    when Sock        :: gen_tcp:socket(),
+    when Request :: request(),
-         Request     :: request(),
+         Parent  :: pid(),
-         Received    :: binary(),
+         Debug   :: [sys:dbg_opt()],
-         NewReceived :: binary().
+         State   :: state().
 
-handle_request(Sock, R = #request{method = M, path = P}, Received) when M =/= undefined, P =/= undefined ->
+handle_request(Req = #request{method = Method, path = Path}, Parent, Debug, State)
-    tell("~tp ~tp ~ts", [self(), M, P]),
+        when Method =/= undefined,
-    route(Sock, M, P, R, Received).
+             Path   =/= undefined ->
+    tell("~tp ~tp ~ts", [self(), Method, Path]),
+    route(Method, Path, Req, Parent, Debug, State).
 
 
-
+% hardcode routes first
--spec route(Sock, Method, Route, Request, Received) -> NewReceived
+route(get, Route, Request, P, D, S = #s{socket = Sock}) ->
-    when Sock        :: gen_tcp:socket(),
-         Method      :: get | post,
-         Route       :: binary(),
-         Request     :: request(),
-         Received    :: binary(),
-         NewReceived :: binary().
-
-route(Sock, get, Route, Request, Received) ->
     case Route of
-         <<"/ws/echo">>   -> ws_echo(Sock, Request)                 , Received;
+         <<"/ws/echo">>   -> ws_echo(Sock, Request);
-         <<"/ws/webrtc">> -> ws_webrtc(Sock, Request, Received)     , Received;
+         <<"/ws/webrtc">> ->
-         <<"/">>          -> route_static(Sock, <<"/index.html">>)  , Received;
+            ws_webrtc(Request, S);
-         _                -> route_static(Sock, Route)              , Received
+         <<"/">> ->
+            route_static(Sock, <<"/index.html">>),
+            loop(P, D, S);
+         _ ->
+            route_static(Sock, Route),
+            loop(P, D, S)
     end;
-route(Sock, post, Route, Request, Received) ->
+route(post, Route, Request, P, D, S = #s{socket = Sock}) ->
     case Route of
-         <<"/wfcin">>       -> wfcin(Sock, Request) , Received;
+         <<"/wfcin">> ->
-         _                  -> fd_httpd_utils:http_err(Sock, 404)  , Received
+            wfcin(Sock, Request),
+            loop(P, D, S);
+         _ ->
+            fd_httpd_utils:http_err(Sock, 404),
+            loop(P, D, S)
     end;
-route(Sock, _, _, _, Received) ->
+route(_, _, _, P, D, S = #s{socket = Sock}) ->
     fd_httpd_utils:http_err(Sock, 404),
-    Received.
+    loop(P, D, S).
 
 
 
@@ -295,101 +297,60 @@ respond_static(Sock, not_found) ->
 %% webrtc
 %% ------------------------------
 
--record(rs,
+ws_webrtc(Request, State = #s{socket = Sock}) ->
-        {socket               :: gen_tcp:socket(),
-         received = <<>>      :: binary(),
-         username = undefined :: undefined | string()}).
-
--type webrtc_state() :: #rs{}.
-
-ws_webrtc(Sock, Request, Received) ->
     try
         case qhl_ws:handshake(Request) of
             {ok, Response} ->
                 fd_httpd_utils:respond(Sock, Response),
-                ws_webrtc_loop(#rs{socket = Sock, received = Received});
+                % wait for username
+                ok = fd_httpd_webrtc:join(),
+                ws_webrtc_loop(State);
             Error ->
                 tell("ws_webrtc: error: ~tp", [Error]),
-                fd_httpd_utils:http_err(Sock, 400)
+                fd_httpd_utils:http_err(Sock, 400),
+                exit(bad_request)
         end
     catch
         X:Y:Z ->
             tell(error, "CRASH ws_webrtc: ~tp:~tp:~tp", [X, Y, Z]),
-            fd_httpd_utils:http_err(Sock, 500)
+            fd_httpd_utils:http_err(Sock, 500),
+            error(internal_server_error)
     end.
 
 
--define(WEBRTC_TIMEOUT, 30*qhl_ws:min()).
+-spec ws_webrtc_loop(state()) -> no_return().
 
-
-
--spec ws_webrtc_loop(webrtc_state()) -> no_return().
-
-%% first thing is to get username
-ws_webrtc_loop(State = #rs{socket   = Socket,
-                           received = Recv,
-                           username = undefined}) ->
-    {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,
+ws_webrtc_loop(State = #s{socket = Socket, next = <<>>}) ->
-                           received = <<>>}) ->
     ok = inet:setopts(Socket, [{active, once}]),
     receive
         {tcp, Socket, Message} ->
-            NewState = State#rs{received = Message},
+            NewState = State#s{next = Message},
             ws_webrtc_loop(NewState);
         {webrtc, Message} ->
-            NewState = ws_webrtc_handle_webrtc(Message, State),
+            ok = ws_webrtc_relay(Socket, s2c, Message),
-            ws_webrtc_loop(NewState);
+            ws_webrtc_loop(State);
         {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,
+ws_webrtc_loop(State = #s{socket = Sock, next = Recv}) ->
-                           received = R}) ->
+    {ok, Message, NewRecv} = qhl_ws:recv_json(Sock, Recv, 5000),
-    {ok, Message, NewR} = qhl_ws:recv_json(Socket, R, 5000),
+    ok = ws_webrtc_relay(Sock, c2s, Message),
-    NewState = ws_webrtc_handle_json(Message, State#rs{received = NewR}),
+    ws_webrtc_loop(State#s{next = NewRecv}).
-    ws_webrtc_loop(NewState).
 
 
+% relay
+% message is a zj:value()
+ws_webrtc_relay(Socket, Direction, ZJValue) ->
+    tell("~p ws_webrtc_relay ~p: ~p", [self(), Direction, ZJValue]),
+    case Direction of
+        c2s -> fd_httpd_webrtc:hi(ZJValue);
+        s2c -> qhl_ws:send_json(Socket, ZJValue)
+    end,
+    ok.
 
--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.
 
 
 %% ------------------------------

src/fd_httpd_webrtc.erl

@@ -5,7 +5,7 @@
 
 %% api (caller context)
 -export([
-    join/1
+    join/0, hi/1
 ]).
 
 % startup/gen_server callbacks
@@ -20,15 +20,10 @@
 -include("$zx_include/zx_logger.hrl").
 
 
--record(u,
+-record(u, {pid :: pid()}).
-        {pid      :: pid(),
-         username :: string()}).
-
 -type user() :: #u{}.
 
--record(s,
+-record(s, {users = [] :: [user()]}).
-        {users = [] :: [user()]}).
-
 -type state() :: #s{}.
 
 
@@ -42,10 +37,18 @@ start_link() ->
 
 
 
--spec join(Username :: string()) -> {ok, ActualUsername :: string()} | {error, any()}.
+-spec join() -> ok | {error, any()}.
 
-join(Username) ->
+join() ->
-    gen_server:call(?MODULE, {join, Username}).
+    gen_server:call(?MODULE, join).
+
+
+
+-spec hi(Message) -> ok
+    when Message :: zj:value().
+
+hi(Message) ->
+    gen_server:cast(?MODULE, {hi, self(), Message}).
 
 
 
@@ -61,8 +64,8 @@ init(none) ->
     {ok, InitState}.
 
 
-handle_call({join, Username}, _From = {PID, _Tag}, State) ->
+handle_call(join, _From = {PID, _Tag}, State) ->
-    {Reply, NewState} = do_join(Username, PID, State),
+    {Reply, NewState} = do_join(PID, State),
     {reply, Reply, NewState};
 handle_call(Unexpected, From, State) ->
     tell("~tp: unexpected call from ~tp: ~tp", [?MODULE, Unexpected, From]),
@@ -93,49 +96,31 @@ terminate(_, _) ->
 %% doers
 %%---------------------
 
--spec do_join(Username, PID, State) -> {Reply, NewState}
+-spec do_join(PID, State) -> {Reply, NewState}
-    when Username :: string(),
+    when PID      :: pid(),
-         PID      :: pid(),
          State    :: state(),
-         Reply    :: {ok, ActualUsername :: string()}
+         Reply    :: ok
                    | {error, any()},
          NewState :: state().
 % @private join a user to a pool
 
-do_join(Username, PID, State = #s{users = Users}) ->
+do_join(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)
+        false -> do_join2(PID, State)
     end.
 
-do_join2(Username, PID, State = #s{users = Users}) ->
+do_join2(PID, State = #s{users = Users}) ->
     monitor(process, PID),
-    ActualUsername = unique_username(Username, Users),
+    NewUser = #u{pid = PID},
-    NewUser = #u{pid = PID, username = ActualUsername},
     NewRoster = usort([NewUser | Users]),
     NewState  = State#s{users = NewRoster},
-    ok = gossip_roster(NewState),
+    ok = gossip({join, PID}, NewState),
-    {{ok, ActualUsername}, NewState}.
+    {ok, NewState}.
 
 usort(Users) ->
-    lists:keysort(#u.username, Users).
+    lists:keysort(#u.pid, 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
@@ -146,27 +131,24 @@ unique_username(Username, N, Users) ->
 
 do_down(PID, State = #s{users = Users}) ->
     % remove from users
-    NewUsers = usort(lists:keydelete(PID, #u.pid, Users)),
+    NewUsers = lists:keydelete(PID, #u.pid, Users),
     NewState = State#s{users = NewUsers},
     % broadcast username
-    ok = gossip_roster(State),
+    ok = gossip({down, PID}, NewState),
     NewState.
 
 
+gossip({join, PID}, State) -> gossip_json(["join", pidstr(PID)], State);
+gossip({down, PID}, State) -> gossip_json(["down", pidstr(PID)], State).
 
--spec gossip_roster(state()) -> ok.
+pidstr(PID) ->
-% @private gossip the roster to everyone
+    unicode:characters_to_list(io_lib:format("~tp", [PID])).
-
-gossip_roster(State = #s{users = Users}) ->
-    Usernames = [Username || #u{username = Username} <- Users],
-    gossip({users, Usernames}, State).
 
 
-
+-spec gossip_json(zj:value(), state()) -> ok.
--spec gossip(any(), state()) -> ok.
 % @private gossip a message to everyone
 
-gossip(Message, #s{users = Users}) ->
+gossip_json(Message, #s{users = Users}) ->
     GossipTo =
         fun(#u{pid = PID}) ->
             PID ! {webrtc, Message}