webrtc frontend can request username from backend

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

@@ -0,0 +1,14 @@
+/**
+ * webrtc page script
+ *
+ * Author: Peter Harpending <peterharpending@qpq.swiss>
+ * Date: 2026-02-04
+ * Copyright: Copyright (c) 2026 QPQ AG
+ *
+ * Reference: https://git.qpq.swiss/QPQ-AG/research-megadoc/src/commit/c7c4592d4b21ad120145ef63334471a1a7ec1e60/paste/2026-02/grok-webrtc.html
+ *
+ * @module
+ */
+declare function main(): Promise<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

@@ -0,0 +1,45 @@
+"use strict";
+/**
+ * webrtc page script
+ *
+ * Author: Peter Harpending <peterharpending@qpq.swiss>
+ * Date: 2026-02-04
+ * Copyright: Copyright (c) 2026 QPQ AG
+ *
+ * Reference: https://git.qpq.swiss/QPQ-AG/research-megadoc/src/commit/c7c4592d4b21ad120145ef63334471a1a7ec1e60/paste/2026-02/grok-webrtc.html
+ *
+ * @module
+ */
+main();
+async function main() {
+    // start websocket immediately
+    let ws = new WebSocket('/ws/webrtc');
+    // grab document elements
+    let init = document.getElementById('init');
+    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, 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); };
+}
+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);
+    console.log('sending:\n', s);
+    ws.send(s);
+}
+//# sourceMappingURL=webrtc.js.map

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

@@ -0,0 +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,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"}

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

@@ -36,7 +36,7 @@ main
 
     // handle message from ws
     ws.onopen    = function(e) { console.log('ws open:', e); };
-    ws.onclose   = function(e) { console.log('ws closed:', 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); };
 }

src/fd_httpd_client.erl

@@ -135,8 +135,16 @@ loop(Parent, Debug, State = #s{socket = Socket, next = Next0}) ->
             Received = <<Next0/binary, Message/binary>>,
             case qhl:parse(Socket, Received) of
                 {ok, Req, Next1} ->
-                    Next2 = handle_request(Socket, Req, Next1),
+                    %% FIXME: unfuck received logic here
-                    NewState = State#s{next = Next2},
+                    %% handle_request should eventually call back into
+                    %% loop/3 or close the socket
+                    Next2 =
+                        case Next1 of
+                            none -> <<>>;
+                            Bin  -> Bin
+                        end,
+                    Next3 = handle_request(Socket, Req, Next2),
+                    NewState = State#s{next = Next3},
                     loop(Parent, Debug, NewState);
                 Error ->
                     %% should trigger bad request
@@ -233,7 +241,7 @@ handle_request(Sock, R = #request{method = M, path = P}, Received) when M =/= un
 route(Sock, get, Route, Request, Received) ->
     case Route of
          <<"/ws/echo">>   -> ws_echo(Sock, Request)                 , Received;
-         <<"/ws/webrtc">> -> ws_webrtc(Sock, Request)                 , Received;
+         <<"/ws/webrtc">> -> ws_webrtc(Sock, Request, Received)     , Received;
          <<"/">>          -> route_static(Sock, <<"/index.html">>)  , Received;
          _                -> route_static(Sock, Route)              , Received
     end;
@@ -284,13 +292,19 @@ respond_static(Sock, not_found) ->
 %% webrtc
 %% ------------------------------
 
+-record(rs,
+        {received = <<>>      :: binary(),
+         username = undefined :: undefined | string(),
+         peers    = undefined :: undefined | [string()]}).
 
-ws_webrtc(Sock, Request) ->
+-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(Sock);
+                ws_webrtc_loop(Sock, #rs{received = Received});
             Error ->
                 tell("ws_webrtc: error: ~tp", [Error]),
                 fd_httpd_utils:http_err(Sock, 400)
@@ -301,12 +315,24 @@ ws_webrtc(Sock, Request) ->
             fd_httpd_utils:http_err(Sock, 500)
     end.
 
--record(rs,
-        {ident    = username = undefined :: undefined | string(),
-         peers    = undefined :: undefined | [
--type webrtc_state() :: {username 
 
-ws_webrtc_loop(
+-define(WEBRTC_TIMEOUT, 30*qhl_ws:min()).
+
+%% first thing is to get username
+ws_webrtc_loop(Socket, State = #rs{received = Recv,
+                                   username = undefined}) ->
+    %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]),
+    NewState = State#rs{received = NewRecv,
+                        username = Username},
+    ws_webrtc_loop(Socket, NewState);
+ws_webrtc_loop(Socket, State = _) ->
+    tell("~p ws_webrtc_loop nyi state: ~p", [self(), State]),
+    error(nyi).
+
 
 %% ------------------------------
 %% echo

src/qhl_ws.erl

@@ -16,7 +16,9 @@
     %% porcelain
     handshake/1,
     recv/3, recv/4,
-    send/2
+    recv_strict/3, recv_json/3,
+    send/2,
+    send_dwim/2, send_json/2
 ]).
 
 -include("http.hrl").
@@ -259,6 +261,54 @@ response_token(ChallengeToken) when is_binary(ChallengeToken) ->
     base64:encode(Sha1).
 
 
+-spec recv_json(Socket, Received, TimeoutMS) -> Result
+    when Socket    :: gen_tcp:socket(),
+         Received  :: binary(),
+         TimeoutMS :: non_neg_integer(),
+         Result    :: {ok, zj:value(), Remainder}
+                    | {error, Reason},
+         Remainder :: binary(),
+         Reason    :: any().
+% @doc
+% asserts response is text
+
+recv_json(Sock, Recv, TimeoutMS) ->
+    case recv_strict(Sock, Recv, TimeoutMS) of
+        {ok, {Type, Payload}, NewRecv} when Type =:= text orelse
+                                            Type =:= binary ->
+            case zj:decode(Payload) of
+                {ok, Value} ->
+                    io:format("~p value: ~p~n", [self(), Value]),
+                    {ok, Value, NewRecv};
+                Error       -> {error, {zj_decode, Error}}
+            end;
+        Error ->
+            Error
+    end.
+
+
+-spec recv_strict(Socket, Received, TimeoutMS) -> Result
+    when Socket    :: gen_tcp:socket(),
+         Received  :: binary(),
+         TimeoutMS :: non_neg_integer(),
+         Result    :: {ok, Message, Remainder}
+                    | {error, Reason},
+         Message   :: ws_msg(),
+         Remainder :: binary(),
+         Reason    :: any().
+% @doc
+% Almost equivalent to recv/3, but asserts resulting frames are empty
+
+recv_strict(Sock, Recv, TimeoutMS) ->
+    case recv(Sock, Recv, TimeoutMS) of
+        {ok, Message, [], Remainder} ->
+            {ok, Message, Remainder};
+        Illegal = {ok, _, _NonEmptyFrames, _} ->
+            {error, {bad_frame_stack, Illegal}};
+        Error ->
+            Error
+    end.
+
 
 -spec recv(Socket, Received, TimeoutMS) -> Result
     when Socket    :: gen_tcp:socket(),
@@ -604,10 +654,15 @@ recv_frame(Frame = #frame{payload_length = Len, payload = none}, Sock, Received,
 
 %% factoring this out into a function to reduce repetition
 recv_frame_await(Frame, Sock, Received, Timeout) ->
+    io:format("~p called: recv_frame_await(~p, ~p, ~p, ~p)~n",
+              [self(), Frame, Sock, Received, Timeout]),
     case inet:setopts(Sock, [{active, once}]) of
         ok ->
             receive
-                {tcp, Sock, Bin}          -> recv_frame(Frame, Sock, <<Received/bits, Bin/binary>>, Timeout);
+                {tcp, Sock, Bin}          ->
+                    io:format("~p calling: recv_frame(~p, ~p, ~p, ~p)~n",
+                        [self(),Frame, Sock, <<Received/bits, Bin/binary>>, Timeout]),
+                    recv_frame(Frame, Sock, <<Received/bits, Bin/binary>>, Timeout);
                 {tcp_closed, Sock}        -> {error, tcp_closed};
                 {tcp_error, Sock, Reason} -> {error, {tcp_error, Reason}}
             after Timeout ->
@@ -618,6 +673,34 @@ recv_frame_await(Frame, Sock, Received, Timeout) ->
     end.
 
 
+send_json(Socket, X) ->
+    send_dwim(Socket, {json, X}).
+
+
+-spec send_dwim(Socket, Message) -> Result
+    when Socket  :: gen_tcp:socket(),
+         Message :: string()
+                  | binary()
+                  | {json, zj:value()}
+                  | ws_msg(),
+         Result  :: ok
+                  | {error, Reason},
+         Reason  :: any().
+% @doc
+% equivalent to send/2 but assumes iolists/strings are meant to be `text`, and
+% naked binaries are meant to be `binary`
+%
+% lists are assumed to be unicode iolists and are converted to strings via
+% unicode:characters_to_list
+%
+% json is encoded as text and sent as such
+% @end
+
+send_dwim(Socket, X) when is_list(X)   -> send(Socket, {text, X});
+send_dwim(Socket, X) when is_binary(X) -> send(Socket, {binary, X});
+send_dwim(Socket, {json, X})           -> send(Socket, {text, zj:encode(X)});
+send_dwim(Socket, {Type, Payload})     -> send(Socket, {Type, Payload}).
+
 
 -spec send(Socket, Message) -> Result
     when Socket  :: gen_tcp:socket(),