Compare commits
39 Commits
0.1.0
...
b871968f8c
| Author | SHA1 | Date | |
|---|---|---|---|
| b871968f8c | |||
| 6028bb5850 | |||
| 25a775ee96 | |||
| b6436c84ee | |||
| cc95fc5829 | |||
| ce7b8a1ccd | |||
| 8d5320e4e5 | |||
| 57e7254f8d | |||
| e379a86020 | |||
| e160701403 | |||
| cbfc496057 | |||
| ff257ae976 | |||
| e12466d5f2 | |||
| 4e48d6b40b | |||
| 1aed42598a | |||
| b55b0bd056 | |||
| 7815ae3c57 | |||
| 882a416831 | |||
| 4bd279798c | |||
| 138c8eaaeb | |||
| b3599633f9 | |||
| f3a107111f | |||
| 8b938fdd42 | |||
| 80945de92d | |||
| 2151fff0fa | |||
| 73fc38b7ad | |||
| a0418788c5 | |||
| cb600dc0da | |||
| 027c020a34 | |||
| 079c47962a | |||
| 7ed8b12c4e | |||
| 4509a328a8 | |||
| 04970142aa | |||
| b44292a790 | |||
| 1865f03085 | |||
| 5824aaaf36 | |||
| 35dbf06a55 | |||
| 62d0710fcf | |||
| 9107679dfc |
@@ -0,0 +1,7 @@
|
||||
tsc:
|
||||
cd priv/static/js &&\
|
||||
tsc
|
||||
|
||||
watch:
|
||||
cd priv/static/js &&\
|
||||
tsc --watch
|
||||
@@ -1,3 +1,10 @@
|
||||
OPEN LOOPS - 2025-11-12
|
||||
- websockets
|
||||
- separate websocket handling from websocket parsing/sending
|
||||
- do renaming
|
||||
- make wfc not terrible
|
||||
|
||||
|
||||
VIDEO 1 - 2025-09-16
|
||||
TODONE
|
||||
- add qhl as dep
|
||||
|
||||
+8
-3
@@ -3,7 +3,12 @@
|
||||
{registered,[]},
|
||||
{included_applications,[]},
|
||||
{applications,[stdlib,kernel]},
|
||||
{vsn,"0.1.0"},
|
||||
{modules,[fd_client,fd_client_man,fd_client_sup,fd_clients,
|
||||
fd_sup,fewd]},
|
||||
{vsn,"0.2.0"},
|
||||
{modules,[fd_httpd,fd_httpd_client,fd_httpd_client_man,
|
||||
fd_httpd_client_sup,fd_httpd_clients,fd_httpd_sfc,
|
||||
fd_httpd_sfc_cache,fd_httpd_sfc_entry,fd_httpd_utils,
|
||||
fd_sup,fd_wfcd,fd_wfcd_cache,fewd,qhl,qhl_ws,wfc,
|
||||
wfc_bm,wfc_eval,wfc_eval_context,wfc_ltr,wfc_pp,
|
||||
wfc_read,wfc_sentence,wfc_sftt,wfc_ttfuns,wfc_utils,
|
||||
wfc_word,zj]},
|
||||
{mod,{fewd,[]}}]}.
|
||||
|
||||
+8
-1
@@ -4,7 +4,7 @@
|
||||
qargs = undefined :: undefined | #{Key :: binary() := Value :: binary()},
|
||||
fragment = undefined :: undefined | none | binary(),
|
||||
version = undefined :: undefined | http10 | http11 | http20,
|
||||
headers = undefined :: undefined | [{Key :: binary(), Value :: binary()}],
|
||||
headers = undefined :: undefined | #{Key :: binary() := Value :: binary()},
|
||||
cookies = undefined :: undefined | #{Key :: binary() := Value :: binary()},
|
||||
enctype = undefined :: undefined | none | urlencoded | json | multipart(),
|
||||
size = undefined :: undefined | none | non_neg_integer(),
|
||||
@@ -23,3 +23,10 @@
|
||||
-type body() :: {partial, binary()} | {multipart, [body_part()]} | zj:value() | binary().
|
||||
-type body_part() :: {Field :: binary(), Data :: binary()}
|
||||
| {Field :: binary(), Name :: binary(), Data :: binary()}.
|
||||
|
||||
|
||||
-type request() :: #request{}.
|
||||
-type response() :: #response{}.
|
||||
-type tcp_error() :: closed
|
||||
| {timeout, RestData :: binary() | erlang:iovec()}
|
||||
| inet:posix().
|
||||
|
||||
-135
@@ -1,135 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>WF Compiler Demo</title>
|
||||
<link rel="stylesheet" href="./default.css">
|
||||
</head>
|
||||
<body>
|
||||
<div class="content">
|
||||
<h1 class="content-title">WFC Demo</h1>
|
||||
|
||||
<div class="content-body">
|
||||
<textarea id="wfc-output"
|
||||
disabled
|
||||
></textarea>
|
||||
<input autofocus id="wfc-input"></textarea>
|
||||
|
||||
<h2>Settings</h2>
|
||||
<input type="checkbox" checked id="auto-resize-output">Auto-resize output</input> <br>
|
||||
<input type="checkbox" checked id="auto-scroll" >Auto-scroll output to bottom</input>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
let ielt = document.getElementById('wfc-input');
|
||||
let oelt = document.getElementById('wfc-output');
|
||||
let MAX_OELT_HEIGHT = 300;
|
||||
|
||||
function auto_resize_output() {
|
||||
// if the user has manually resized their output, we do nothing
|
||||
if (document.getElementById('auto-resize-output').checked) {
|
||||
// resize it automagically up to 500px
|
||||
if (oelt.scrollHeight < MAX_OELT_HEIGHT) {
|
||||
oelt.style.height = String(oelt.scrollHeight) + 'px';
|
||||
}
|
||||
else {
|
||||
oelt.style.height = String(MAX_OELT_HEIGHT) + 'px';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function auto_scroll_to_bottom() {
|
||||
if (document.getElementById('auto-scroll').checked) {
|
||||
// scroll to bottom
|
||||
oelt.scrollTop = oelt.scrollHeight;
|
||||
}
|
||||
}
|
||||
|
||||
async function on_server_return(response) {
|
||||
console.log('on_server_return:', response);
|
||||
if (response.ok) {
|
||||
let jsbs = await response.json();
|
||||
console.log('jsbs', jsbs);
|
||||
// jsbs: {ok: true, result: string} | {ok: false, error: string}
|
||||
if (jsbs.ok) {
|
||||
// this means got a result back from server
|
||||
// put it in
|
||||
oelt.value += jsbs.result;
|
||||
oelt.value += '\n';
|
||||
}
|
||||
else {
|
||||
// this is an error at the WFC level
|
||||
oelt.value += jsbs.error;
|
||||
oelt.value += '\n';
|
||||
}
|
||||
}
|
||||
// this means we sent an invalid request
|
||||
else {
|
||||
oelt.value += 'HTTP ERROR, SEE BROWSER CONSOLE\n'
|
||||
}
|
||||
}
|
||||
|
||||
function on_some_bullshit(x) {
|
||||
console.log('on_some_bullshit:', x);
|
||||
oelt.value += 'NETWORK ERROR, SEE BROWSER CONSOLE\n'
|
||||
}
|
||||
|
||||
function fetch_wfcin(user_line) {
|
||||
let req_body_obj = {wfcin: user_line};
|
||||
// let req_body_str = JSON.stringify(req_body_obj, undefined, 4);
|
||||
let req_body_str = JSON.stringify(req_body_obj);
|
||||
|
||||
let req_options = {method: 'POST',
|
||||
headers: {'content-type': 'application/json'},
|
||||
body: req_body_str};
|
||||
|
||||
let response_promise = fetch('/wfcin', req_options);
|
||||
|
||||
response_promise.then(on_server_return, on_some_bullshit);
|
||||
|
||||
// this is a promise for a response
|
||||
//console.log(response_promise);
|
||||
}
|
||||
|
||||
// when user hits any key
|
||||
function on_input_key(evt) {
|
||||
if (evt.key === 'Enter') {
|
||||
// don't do default thing
|
||||
evt.preventDefault();
|
||||
// grab contents
|
||||
let contents = ielt.value;
|
||||
// if contents are nonempty
|
||||
let nonempty_contents = contents.trim().length > 0;
|
||||
if (nonempty_contents) {
|
||||
// put in output
|
||||
// // if it's nonempty add a newline
|
||||
// if (oelt.value.length > 0) {
|
||||
// oelt.value += '\n';
|
||||
// }
|
||||
oelt.value += '> ' + contents + '\n';
|
||||
oelt.hidden = false;
|
||||
|
||||
// query backend for result
|
||||
fetch_wfcin(contents.trim());
|
||||
|
||||
// clear input
|
||||
ielt.value = '';
|
||||
|
||||
// auto-resize
|
||||
auto_resize_output();
|
||||
auto_scroll_to_bottom();
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function main() {
|
||||
ielt.addEventListener('keydown', on_input_key);
|
||||
}
|
||||
|
||||
main();
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -25,6 +25,19 @@ body {
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
/* titlebar */
|
||||
#titlebar {
|
||||
background: var(--lgray2);
|
||||
height: 40px;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
a.tb-home{
|
||||
font-size: 30px;
|
||||
text-decoration: none;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
|
||||
.content {
|
||||
max-width: 800px;
|
||||
@@ -0,0 +1,71 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Websockets echo test</title>
|
||||
<link rel="stylesheet" href="/css/default.css">
|
||||
</head>
|
||||
<body>
|
||||
<div id="titlebar">
|
||||
<div class="content">
|
||||
<a href="/" class="tb-home">Home</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="content">
|
||||
<h1 class="content-title">Websockets echo test</h1>
|
||||
|
||||
<div class="content-body">
|
||||
<textarea id="wfc-output"
|
||||
disabled></textarea>
|
||||
<input autofocus id="wfc-input"></input>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
let ielt = document.getElementById('wfc-input');
|
||||
let oelt = document.getElementById('wfc-output');
|
||||
let ws = new WebSocket("/ws/echo");
|
||||
|
||||
// when user hits any key while typing in ielt
|
||||
function on_input_key(evt) {
|
||||
if (evt.key === 'Enter') {
|
||||
// don't do default thing
|
||||
evt.preventDefault();
|
||||
// grab contents
|
||||
let contents = ielt.value;
|
||||
let trimmed = contents.trim();
|
||||
// if contents are nonempty
|
||||
let nonempty_contents = trimmed.length > 0;
|
||||
if (nonempty_contents) {
|
||||
console.log('message to server:', contents.trim());
|
||||
// query backend for result
|
||||
ws.send(contents.trim());
|
||||
|
||||
// clear input
|
||||
ielt.value = '';
|
||||
|
||||
// add to output
|
||||
oelt.value += '> ';
|
||||
oelt.value += trimmed;
|
||||
oelt.value += '\n';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function main() {
|
||||
ielt.addEventListener('keydown', on_input_key);
|
||||
ws.onmessage =
|
||||
function (msg_evt) {
|
||||
console.log('message from server:', msg_evt);
|
||||
let msg_str = msg_evt.data;
|
||||
oelt.value += '< ';
|
||||
oelt.value += msg_str;
|
||||
oelt.value += '\n';
|
||||
};
|
||||
}
|
||||
|
||||
main();
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,25 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>WF Compiler Demo</title>
|
||||
<link rel="stylesheet" href="/css/default.css">
|
||||
</head>
|
||||
<body>
|
||||
<div id="titlebar">
|
||||
<div class="content">
|
||||
<a href="/" class="tb-home">Home</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="content">
|
||||
<h1 class="content-title">FEWD: index</h1>
|
||||
|
||||
<ul>
|
||||
<li><a href="/echo.html">Echo</a></li>
|
||||
<li><a href="/webrtc.html">WebRTC</a></li>
|
||||
<li><a href="/wfc.html">WFC</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
Vendored
+8
@@ -0,0 +1,8 @@
|
||||
/**
|
||||
* FEWD common js lib functions
|
||||
*
|
||||
* @module
|
||||
*/
|
||||
export { auto_resize, auto_scroll_to_bottom };
|
||||
declare function auto_resize(checkbox_element: HTMLInputElement, target_element: HTMLTextAreaElement, max_height: number): void;
|
||||
declare function auto_scroll_to_bottom(checkbox_element: HTMLInputElement, target_element: HTMLTextAreaElement): void;
|
||||
Vendored
+24
@@ -0,0 +1,24 @@
|
||||
/**
|
||||
* FEWD common js lib functions
|
||||
*
|
||||
* @module
|
||||
*/
|
||||
export { auto_resize, auto_scroll_to_bottom };
|
||||
function auto_resize(checkbox_element, target_element, max_height) {
|
||||
// if the user has manually resized their output, we do nothing
|
||||
if (checkbox_element.checked) {
|
||||
let target_height = target_element.scrollHeight;
|
||||
// resize it automagically up to 500px
|
||||
if (target_height < max_height)
|
||||
target_element.style.height = String(target_height) + 'px';
|
||||
else
|
||||
target_element.style.height = String(max_height) + 'px';
|
||||
}
|
||||
}
|
||||
function auto_scroll_to_bottom(checkbox_element, target_element) {
|
||||
if (checkbox_element.checked) {
|
||||
// scroll to bottom
|
||||
target_element.scrollTop = target_element.scrollHeight;
|
||||
}
|
||||
}
|
||||
//# sourceMappingURL=libfewd.js.map
|
||||
Vendored
+1
@@ -0,0 +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;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"}
|
||||
Vendored
+6
@@ -0,0 +1,6 @@
|
||||
/**
|
||||
* Tetris
|
||||
*
|
||||
* @module
|
||||
*/
|
||||
export {};
|
||||
Vendored
+30
@@ -0,0 +1,30 @@
|
||||
/**
|
||||
* Tetris
|
||||
*
|
||||
* @module
|
||||
*/
|
||||
main();
|
||||
async function main() {
|
||||
let ws = new WebSocket("/ws/tetris");
|
||||
let elt_tetris_state = document.getElementById('tetris-state');
|
||||
ws.onmessage =
|
||||
(e) => {
|
||||
handle_evt(e, elt_tetris_state);
|
||||
};
|
||||
}
|
||||
//-----------------------------------------------------
|
||||
// Tetris
|
||||
//-----------------------------------------------------
|
||||
/**
|
||||
* take the entire tetris state, render the html elements
|
||||
*
|
||||
* then fish out the element in the document, and replace it
|
||||
*
|
||||
* blitting basically
|
||||
*/
|
||||
async function handle_evt(e, oelt) {
|
||||
let state_str = e.data;
|
||||
oelt.value = state_str;
|
||||
}
|
||||
export {};
|
||||
//# sourceMappingURL=tetris.js.map
|
||||
Vendored
+1
@@ -0,0 +1 @@
|
||||
{"version":3,"file":"tetris.js","sourceRoot":"","sources":["../ts/tetris.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAQH,IAAI,EAAE,CAAC;AAEP,KAAK,UACL,IAAI;IAIA,IAAI,EAAE,GAAuC,IAAI,SAAS,CAAC,YAAY,CAAC,CAAqC;IAC7G,IAAI,gBAAgB,GAAyB,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAwB,CAAE;IAE7G,EAAE,CAAC,SAAS;QACR,CAAC,CAAe,EAAE,EAAE;YAChB,UAAU,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC;QACpC,CAAC,CAAA;AACT,CAAC;AAED,uDAAuD;AACvD,SAAS;AACT,uDAAuD;AAGvD;;;;;;GAMG;AACH,KAAK,UACL,UAAU,CACL,CAAmB,EACnB,IAA0B;IAG3B,IAAI,SAAS,GAAY,CAAC,CAAC,IAAc,CAAC;IAC1C,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;AAC3B,CAAC"}
|
||||
Vendored
+16
@@ -0,0 +1,16 @@
|
||||
/**
|
||||
* 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>;
|
||||
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;
|
||||
Vendored
+66
@@ -0,0 +1,66 @@
|
||||
"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 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);
|
||||
});
|
||||
// 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;
|
||||
}
|
||||
}
|
||||
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
|
||||
Vendored
+1
@@ -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,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"}
|
||||
Vendored
+6
@@ -0,0 +1,6 @@
|
||||
/**
|
||||
* Home page ts/js
|
||||
*
|
||||
* @module
|
||||
*/
|
||||
export {};
|
||||
Vendored
+79
@@ -0,0 +1,79 @@
|
||||
/**
|
||||
* Home page ts/js
|
||||
*
|
||||
* @module
|
||||
*/
|
||||
import * as libfewd from './libfewd.js';
|
||||
//------------------------------------------------------------------
|
||||
// page element stuff
|
||||
//------------------------------------------------------------------
|
||||
main();
|
||||
function main() {
|
||||
let ielt = document.getElementById('wfc-input');
|
||||
let oelt = document.getElementById('wfc-output');
|
||||
let cb_resize = document.getElementById('auto-resize-output');
|
||||
let cb_scroll = document.getElementById('auto-scroll');
|
||||
let MAX_OELT_HEIGHT = 300;
|
||||
ielt.addEventListener('keydown', function (e) {
|
||||
on_input_key(e, ielt, oelt, cb_resize, cb_scroll, MAX_OELT_HEIGHT);
|
||||
});
|
||||
}
|
||||
// when user hits any key
|
||||
async function on_input_key(evt, ielt, oelt, cb_resize, cb_scroll, max_height) {
|
||||
if (evt.key === 'Enter') {
|
||||
// don't do default thing
|
||||
evt.preventDefault();
|
||||
// grab contents
|
||||
let contents = ielt.value;
|
||||
let trimmed = contents.trim();
|
||||
let nonempty = trimmed.length > 0;
|
||||
// if contents are nonempty
|
||||
if (nonempty) {
|
||||
// clear input
|
||||
ielt.value = '';
|
||||
// put in output
|
||||
oelt.value += '> ' + trimmed + '\n';
|
||||
oelt.hidden = false;
|
||||
// query backend for result
|
||||
let result = await fetch_wfcin(trimmed);
|
||||
if (result.ok)
|
||||
oelt.value += result.result;
|
||||
else
|
||||
oelt.value += result.error;
|
||||
oelt.value += '\n';
|
||||
// auto-resize
|
||||
libfewd.auto_resize(cb_resize, oelt, max_height);
|
||||
libfewd.auto_scroll_to_bottom(cb_scroll, oelt);
|
||||
}
|
||||
}
|
||||
}
|
||||
function assert(condition, fail_msg) {
|
||||
if (!condition)
|
||||
throw new Error(fail_msg);
|
||||
}
|
||||
async function fetch_wfcin(user_line) {
|
||||
let req_body_obj = { wfcin: user_line };
|
||||
let req_body_str = JSON.stringify(req_body_obj);
|
||||
let req_options = { method: 'POST',
|
||||
headers: { 'content-type': 'application/json' },
|
||||
body: req_body_str };
|
||||
// default result = somehow neither branch of code below was run(?)
|
||||
// putting this here so ts doesn't chimp out
|
||||
let result = { ok: false,
|
||||
error: 'IT DO BE LIKE THAT MISTA STANCIL' };
|
||||
try {
|
||||
let response = await fetch('/wfcin', req_options);
|
||||
if (response.ok)
|
||||
result = await response.json();
|
||||
else {
|
||||
console.log('bad http response:', response);
|
||||
result = { ok: false, error: 'BAD HTTP RESPONSE' };
|
||||
}
|
||||
}
|
||||
catch (x) {
|
||||
console.log('network error:', x);
|
||||
result = { ok: false, error: 'NETWORK ERROR' };
|
||||
}
|
||||
return result;
|
||||
}
|
||||
//# sourceMappingURL=wfc.js.map
|
||||
Vendored
+1
@@ -0,0 +1 @@
|
||||
{"version":3,"file":"wfc.js","sourceRoot":"","sources":["../ts/wfc.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AAEvC,oEAAoE;AACpE,qBAAqB;AACrB,oEAAoE;AAEpE,IAAI,EAAE,CAAC;AAEP,SACA,IAAI;IAIA,IAAI,IAAI,GAAoC,QAAQ,CAAC,cAAc,CAAC,WAAW,CAA8B,CAAK;IAClH,IAAI,IAAI,GAAoC,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAgC,CAAE;IAClH,IAAI,SAAS,GAA+B,QAAQ,CAAC,cAAc,CAAC,oBAAoB,CAAqB,CAAK;IAClH,IAAI,SAAS,GAA+B,QAAQ,CAAC,cAAc,CAAC,aAAa,CAA4B,CAAK;IAClH,IAAI,eAAe,GAAyB,GAAG,CAAC;IAGhD,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAC3B,UAAS,CAAgB;QACrB,YAAY,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,eAAe,CAAC,CAAC;IACvE,CAAC,CACJ,CAAC;AACN,CAAC;AAGD,yBAAyB;AACzB,KAAK,UACL,YAAY,CACP,GAA0B,EAC1B,IAA6B,EAC7B,IAAgC,EAChC,SAA6B,EAC7B,SAA6B,EAC7B,UAAmB;IAGpB,IAAI,GAAG,CAAC,GAAG,KAAK,OAAO,EAAE;QACrB,yBAAyB;QACzB,GAAG,CAAC,cAAc,EAAE,CAAC;QACrB,gBAAgB;QAChB,IAAI,QAAQ,GAAa,IAAI,CAAC,KAAK,CAAC;QACpC,IAAI,OAAO,GAAc,QAAQ,CAAC,IAAI,EAAE,CAAC;QACzC,IAAI,QAAQ,GAAa,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;QAC5C,2BAA2B;QAC3B,IAAI,QAAQ,EAAE;YACV,cAAc;YACd,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;YAEhB,gBAAgB;YAChB,IAAI,CAAC,KAAK,IAAI,IAAI,GAAG,OAAO,GAAG,IAAI,CAAC;YACpC,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;YAEpB,2BAA2B;YAC3B,IAAI,MAAM,GAAY,MAAM,WAAW,CAAC,OAAO,CAAC,CAAC;YAEjD,IAAI,MAAM,CAAC,EAAE;gBACT,IAAI,CAAC,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC;;gBAE5B,IAAI,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC;YAC/B,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC;YAEnB,cAAc;YACd,OAAO,CAAC,WAAW,CAAC,SAAS,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;YACjD,OAAO,CAAC,qBAAqB,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;SAClD;KACJ;AACL,CAAC;AAaD,SACA,MAAM,CACD,SAAmB,EACnB,QAAkB;IAGnB,IAAG,CAAC,SAAS;QACT,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC;AAClC,CAAC;AAGD,KAAK,UACL,WAAW,CACN,SAAkB;IAGnB,IAAI,YAAY,GAAG,EAAC,KAAK,EAAE,SAAS,EAAC,CAAC;IACtC,IAAI,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IAEhD,IAAI,WAAW,GAAI,EAAC,MAAM,EAAG,MAAM;QACf,OAAO,EAAE,EAAC,cAAc,EAAE,kBAAkB,EAAC;QAC7C,IAAI,EAAK,YAAY,EAAC,CAAC;IAE3C,mEAAmE;IACnE,4CAA4C;IAC5C,IAAI,MAAM,GAAW,EAAC,EAAE,EAAM,KAAK;QACb,KAAK,EAAG,kCAAkC,EAAC,CAAC;IAElE,IAAI;QACA,IAAI,QAAQ,GAAc,MAAM,KAAK,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QAC7D,IAAI,QAAQ,CAAC,EAAE;YACX,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAY,CAAC;aACxC;YACD,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,QAAQ,CAAC,CAAC;YAC5C,MAAM,GAAG,EAAC,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,mBAAmB,EAAC,CAAC;SACpD;KACJ;IACD,OAAO,CAAM,EAAE;QACX,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC;QACjC,MAAM,GAAG,EAAC,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,eAAe,EAAC,CAAC;KAChD;IAED,OAAO,MAAM,CAAC;AAClB,CAAC"}
|
||||
@@ -0,0 +1,43 @@
|
||||
/**
|
||||
* FEWD common js lib functions
|
||||
*
|
||||
* @module
|
||||
*/
|
||||
|
||||
export {
|
||||
auto_resize,
|
||||
auto_scroll_to_bottom
|
||||
};
|
||||
|
||||
|
||||
function
|
||||
auto_resize
|
||||
(checkbox_element : HTMLInputElement,
|
||||
target_element : HTMLTextAreaElement,
|
||||
max_height : number)
|
||||
: void
|
||||
{
|
||||
// if the user has manually resized their output, we do nothing
|
||||
if (checkbox_element.checked) {
|
||||
let target_height: number = target_element.scrollHeight;
|
||||
// resize it automagically up to 500px
|
||||
if (target_height < max_height)
|
||||
target_element.style.height = String(target_height) + 'px';
|
||||
else
|
||||
target_element.style.height = String(max_height) + 'px';
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
function
|
||||
auto_scroll_to_bottom
|
||||
(checkbox_element : HTMLInputElement,
|
||||
target_element : HTMLTextAreaElement)
|
||||
: void
|
||||
{
|
||||
if (checkbox_element.checked) {
|
||||
// scroll to bottom
|
||||
target_element.scrollTop = target_element.scrollHeight;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
/**
|
||||
* Tetris
|
||||
*
|
||||
* @module
|
||||
*/
|
||||
|
||||
export {
|
||||
|
||||
};
|
||||
|
||||
import * as libfewd from './libfewd.js';
|
||||
|
||||
main();
|
||||
|
||||
async function
|
||||
main
|
||||
()
|
||||
: Promise<void>
|
||||
{
|
||||
let ws : WebSocket = new WebSocket("/ws/tetris") ;
|
||||
let elt_tetris_state : HTMLTextAreaElement = document.getElementById('tetris-state') as HTMLTextAreaElement ;
|
||||
|
||||
ws.onmessage =
|
||||
(e: MessageEvent) => {
|
||||
handle_evt(e, elt_tetris_state);
|
||||
}
|
||||
}
|
||||
|
||||
//-----------------------------------------------------
|
||||
// Tetris
|
||||
//-----------------------------------------------------
|
||||
|
||||
|
||||
/**
|
||||
* take the entire tetris state, render the html elements
|
||||
*
|
||||
* then fish out the element in the document, and replace it
|
||||
*
|
||||
* blitting basically
|
||||
*/
|
||||
async function
|
||||
handle_evt
|
||||
(e : MessageEvent,
|
||||
oelt : HTMLTextAreaElement)
|
||||
: Promise<void>
|
||||
{
|
||||
let state_str : string = e.data as string;
|
||||
oelt.value = state_str;
|
||||
}
|
||||
@@ -0,0 +1,107 @@
|
||||
/**
|
||||
* 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
|
||||
()
|
||||
: Promise<void>
|
||||
{
|
||||
// start websocket immediately
|
||||
let ws = new WebSocket('/ws/webrtc');
|
||||
|
||||
// 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);
|
||||
}
|
||||
);
|
||||
|
||||
// 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]
|
||||
| ["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,
|
||||
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,
|
||||
x : any)
|
||||
: void
|
||||
{
|
||||
let s: string = JSON.stringify(x, undefined, 4);
|
||||
console.log('sending:\n', s);
|
||||
|
||||
ws.send(s);
|
||||
}
|
||||
@@ -0,0 +1,132 @@
|
||||
/**
|
||||
* Home page ts/js
|
||||
*
|
||||
* @module
|
||||
*/
|
||||
|
||||
import * as libfewd from './libfewd.js'
|
||||
|
||||
//------------------------------------------------------------------
|
||||
// page element stuff
|
||||
//------------------------------------------------------------------
|
||||
|
||||
main();
|
||||
|
||||
function
|
||||
main
|
||||
()
|
||||
: void
|
||||
{
|
||||
let ielt : HTMLInputElement = document.getElementById('wfc-input') as HTMLInputElement ;
|
||||
let oelt : HTMLTextAreaElement = document.getElementById('wfc-output') as HTMLTextAreaElement ;
|
||||
let cb_resize : HTMLInputElement = document.getElementById('auto-resize-output') as HTMLInputElement ;
|
||||
let cb_scroll : HTMLInputElement = document.getElementById('auto-scroll') as HTMLInputElement ;
|
||||
let MAX_OELT_HEIGHT : number = 300;
|
||||
|
||||
|
||||
ielt.addEventListener('keydown',
|
||||
function(e: KeyboardEvent) {
|
||||
on_input_key(e, ielt, oelt, cb_resize, cb_scroll, MAX_OELT_HEIGHT);
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
// when user hits any key
|
||||
async function
|
||||
on_input_key
|
||||
(evt : KeyboardEvent,
|
||||
ielt : HTMLInputElement,
|
||||
oelt : HTMLTextAreaElement,
|
||||
cb_resize : HTMLInputElement,
|
||||
cb_scroll : HTMLInputElement,
|
||||
max_height : number)
|
||||
: Promise<void>
|
||||
{
|
||||
if (evt.key === 'Enter') {
|
||||
// don't do default thing
|
||||
evt.preventDefault();
|
||||
// grab contents
|
||||
let contents : string = ielt.value;
|
||||
let trimmed : string = contents.trim();
|
||||
let nonempty : boolean = trimmed.length > 0;
|
||||
// if contents are nonempty
|
||||
if (nonempty) {
|
||||
// clear input
|
||||
ielt.value = '';
|
||||
|
||||
// put in output
|
||||
oelt.value += '> ' + trimmed + '\n';
|
||||
oelt.hidden = false;
|
||||
|
||||
// query backend for result
|
||||
let result : wfcout = await fetch_wfcin(trimmed);
|
||||
|
||||
if (result.ok)
|
||||
oelt.value += result.result;
|
||||
else
|
||||
oelt.value += result.error;
|
||||
oelt.value += '\n';
|
||||
|
||||
// auto-resize
|
||||
libfewd.auto_resize(cb_resize, oelt, max_height);
|
||||
libfewd.auto_scroll_to_bottom(cb_scroll, oelt);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//------------------------------------------------------------------
|
||||
// wfc api
|
||||
//------------------------------------------------------------------
|
||||
|
||||
type ok_err<t> = {ok: true, result: t}
|
||||
| {ok: false, error: string};
|
||||
|
||||
type wfcin = {wfcin: string};
|
||||
type wfcout = ok_err<string>;
|
||||
|
||||
function
|
||||
assert
|
||||
(condition : boolean,
|
||||
fail_msg : string)
|
||||
: void
|
||||
{
|
||||
if(!condition)
|
||||
throw new Error(fail_msg);
|
||||
}
|
||||
|
||||
|
||||
async function
|
||||
fetch_wfcin
|
||||
(user_line : string)
|
||||
: Promise<wfcout>
|
||||
{
|
||||
let req_body_obj = {wfcin: user_line};
|
||||
let req_body_str = JSON.stringify(req_body_obj);
|
||||
|
||||
let req_options = {method: 'POST',
|
||||
headers: {'content-type': 'application/json'},
|
||||
body: req_body_str};
|
||||
|
||||
// default result = somehow neither branch of code below was run(?)
|
||||
// putting this here so ts doesn't chimp out
|
||||
let result: wfcout = {ok : false,
|
||||
error : 'IT DO BE LIKE THAT MISTA STANCIL'};
|
||||
|
||||
try {
|
||||
let response : Response = await fetch('/wfcin', req_options);
|
||||
if (response.ok)
|
||||
result = await response.json() as wfcout;
|
||||
else {
|
||||
console.log('bad http response:', response);
|
||||
result = {ok: false, error: 'BAD HTTP RESPONSE'};
|
||||
}
|
||||
}
|
||||
catch (x: any) {
|
||||
console.log('network error:', x);
|
||||
result = {ok: false, error: 'NETWORK ERROR'};
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
{"compilerOptions" : {"target" : "es2022",
|
||||
"strict" : true,
|
||||
"esModuleInterop" : true,
|
||||
"skipLibCheck" : true,
|
||||
"forceConsistentCasingInFileNames" : true,
|
||||
"noImplicitAny" : true,
|
||||
"strictNullChecks" : true,
|
||||
"strictPropertyInitialization" : true,
|
||||
"sourceMap" : true,
|
||||
"outDir" : "dist",
|
||||
"declaration" : true},
|
||||
"$schema" : "https://json.schemastore.org/tsconfig",
|
||||
"display" : "Recommended",
|
||||
"include" : ["ts/**/*"],
|
||||
"exclude" : [],
|
||||
"composite" : true}
|
||||
@@ -0,0 +1,36 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>FEWD: voice chat demo</title>
|
||||
<link rel="stylesheet" href="/css/default.css">
|
||||
</head>
|
||||
<body>
|
||||
<div id="titlebar">
|
||||
<div class="content">
|
||||
<a href="/" class="tb-home">Home</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="content">
|
||||
<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>Roster</h2>
|
||||
|
||||
<ul id="roster-ul"></ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script src="/js/dist/webrtc.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,30 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>FEWD: WF Compiler Demo</title>
|
||||
<link rel="stylesheet" href="/css/default.css">
|
||||
</head>
|
||||
<body>
|
||||
<div id="titlebar">
|
||||
<div class="content">
|
||||
<a href="/" class="tb-home">Home</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="content">
|
||||
<h1 class="content-title">WFC Demo</h1>
|
||||
|
||||
<div class="content-body">
|
||||
<textarea disabled id="wfc-output"></textarea>
|
||||
<input autofocus id="wfc-input"></input>
|
||||
|
||||
<h2>Settings</h2>
|
||||
<input type="checkbox" checked id="auto-resize-output">Auto-resize output</input> <br>
|
||||
<input type="checkbox" checked id="auto-scroll" >Auto-scroll output to bottom</input>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script type="module" src="./js/dist/wfc.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -1,368 +0,0 @@
|
||||
%%% @doc
|
||||
%%% front end web development lab Client
|
||||
%%%
|
||||
%%% An extremely naive (currently Telnet) client handler.
|
||||
%%% Unlike other modules that represent discrete processes, this one does not adhere
|
||||
%%% to any OTP behavior. It does, however, adhere to OTP.
|
||||
%%%
|
||||
%%% In some cases it is more comfortable to write socket handlers or a certain
|
||||
%%% category of state machines as "pure" Erlang processes. This approach is made
|
||||
%%% OTP-able by use of the proc_lib module, which is the underlying library used
|
||||
%%% to write the stdlib's behaviors like gen_server, gen_statem, gen_fsm, etc.
|
||||
%%%
|
||||
%%% http://erlang.org/doc/design_principles/spec_proc.html
|
||||
%%% @end
|
||||
|
||||
-module(fd_client).
|
||||
-vsn("0.1.0").
|
||||
-author("Peter Harpending <peterharpending@qpq.swiss>").
|
||||
-copyright("Peter Harpending <peterharpending@qpq.swiss>").
|
||||
-license("BSD-2-Clause-FreeBSD").
|
||||
|
||||
-export([start/1]).
|
||||
-export([start_link/1, init/2]).
|
||||
-export([system_continue/3, system_terminate/4,
|
||||
system_get_state/1, system_replace_state/2]).
|
||||
|
||||
|
||||
%%% Type and Record Definitions
|
||||
|
||||
-include("http.hrl").
|
||||
-include("$zx_include/zx_logger.hrl").
|
||||
|
||||
|
||||
-record(s, {socket = none :: none | gen_tcp:socket(),
|
||||
next = none :: none | binary()}).
|
||||
|
||||
|
||||
%% An alias for the state record above. Aliasing state can smooth out annoyances
|
||||
%% that can arise from using the record directly as its own type all over the code.
|
||||
|
||||
-type state() :: #s{}.
|
||||
|
||||
|
||||
%%% Service Interface
|
||||
|
||||
|
||||
-spec start(ListenSocket) -> Result
|
||||
when ListenSocket :: gen_tcp:socket(),
|
||||
Result :: {ok, pid()}
|
||||
| {error, Reason},
|
||||
Reason :: {already_started, pid()}
|
||||
| {shutdown, term()}
|
||||
| term().
|
||||
%% @private
|
||||
%% How the fd_client_man or a prior fd_client kicks things off.
|
||||
%% This is called in the context of fd_client_man or the prior fd_client.
|
||||
|
||||
start(ListenSocket) ->
|
||||
fd_client_sup:start_acceptor(ListenSocket).
|
||||
|
||||
|
||||
-spec start_link(ListenSocket) -> Result
|
||||
when ListenSocket :: gen_tcp:socket(),
|
||||
Result :: {ok, pid()}
|
||||
| {error, Reason},
|
||||
Reason :: {already_started, pid()}
|
||||
| {shutdown, term()}
|
||||
| term().
|
||||
%% @private
|
||||
%% This is called by the fd_client_sup. While start/1 is called to iniate a startup
|
||||
%% (essentially requesting a new worker be started by the supervisor), this is
|
||||
%% actually called in the context of the supervisor.
|
||||
|
||||
start_link(ListenSocket) ->
|
||||
proc_lib:start_link(?MODULE, init, [self(), ListenSocket]).
|
||||
|
||||
|
||||
-spec init(Parent, ListenSocket) -> no_return()
|
||||
when Parent :: pid(),
|
||||
ListenSocket :: gen_tcp:socket().
|
||||
%% @private
|
||||
%% This is the first code executed in the context of the new worker itself.
|
||||
%% This function does not have any return value, as the startup return is
|
||||
%% passed back to the supervisor by calling proc_lib:init_ack/2.
|
||||
%% We see the initial form of the typical arity-3 service loop form here in the
|
||||
%% call to listen/3.
|
||||
|
||||
init(Parent, ListenSocket) ->
|
||||
ok = io:format("~p Listening.~n", [self()]),
|
||||
Debug = sys:debug_options([]),
|
||||
ok = proc_lib:init_ack(Parent, {ok, self()}),
|
||||
listen(Parent, Debug, ListenSocket).
|
||||
|
||||
|
||||
-spec listen(Parent, Debug, ListenSocket) -> no_return()
|
||||
when Parent :: pid(),
|
||||
Debug :: [sys:dbg_opt()],
|
||||
ListenSocket :: gen_tcp:socket().
|
||||
%% @private
|
||||
%% This function waits for a TCP connection. The owner of the socket is still
|
||||
%% the fd_client_man (so it can still close it on a call to fd_client_man:ignore/0),
|
||||
%% but the only one calling gen_tcp:accept/1 on it is this process. Closing the socket
|
||||
%% is one way a manager process can gracefully unblock child workers that are blocking
|
||||
%% on a network accept.
|
||||
%%
|
||||
%% Once it makes a TCP connection it will call start/1 to spawn its successor.
|
||||
|
||||
listen(Parent, Debug, ListenSocket) ->
|
||||
case gen_tcp:accept(ListenSocket) of
|
||||
{ok, Socket} ->
|
||||
{ok, _} = start(ListenSocket),
|
||||
{ok, Peer} = inet:peername(Socket),
|
||||
ok = io:format("~p Connection accepted from: ~p~n", [self(), Peer]),
|
||||
ok = fd_client_man:enroll(),
|
||||
State = #s{socket = Socket},
|
||||
loop(Parent, Debug, State);
|
||||
{error, closed} ->
|
||||
ok = io:format("~p Retiring: Listen socket closed.~n", [self()]),
|
||||
exit(normal)
|
||||
end.
|
||||
|
||||
|
||||
-spec loop(Parent, Debug, State) -> no_return()
|
||||
when Parent :: pid(),
|
||||
Debug :: [sys:dbg_opt()],
|
||||
State :: state().
|
||||
%% @private
|
||||
%% The service loop itself. This is the service state. The process blocks on receive
|
||||
%% of Erlang messages, TCP segments being received themselves as Erlang messages.
|
||||
|
||||
loop(Parent, Debug, State = #s{socket = Socket, next = Next}) ->
|
||||
ok = inet:setopts(Socket, [{active, once}]),
|
||||
receive
|
||||
{tcp, Socket, Message} ->
|
||||
tell("~p Next = ~p", [?LINE, Next]),
|
||||
Received =
|
||||
case Next of
|
||||
none -> Message;
|
||||
_ -> <<Next/binary, Message/binary>>
|
||||
end,
|
||||
tell("qhl_parse(Socket, ~tp)", [Received]),
|
||||
case qhl:parse(Socket, Received) of
|
||||
{ok, Req, NewNext} ->
|
||||
tell("qhl return: {ok, ~p, ~p}", [Req, NewNext]),
|
||||
handle_request(Socket, Req),
|
||||
NewState = State#s{next = NewNext},
|
||||
loop(Parent, Debug, NewState);
|
||||
Error ->
|
||||
%% should trigger bad request
|
||||
io:format("~p QHL parse error: ~tp", [?LINE, Error]),
|
||||
io:format("~p bad request:~n~ts", [?LINE, Received]),
|
||||
http_err(Socket, 400),
|
||||
gen_tcp:shutdown(Socket, read_write),
|
||||
exit(normal)
|
||||
end;
|
||||
{tcp_closed, Socket} ->
|
||||
ok = io:format("~p Socket closed, retiring.~n", [self()]),
|
||||
exit(normal);
|
||||
{system, From, Request} ->
|
||||
sys:handle_system_msg(Request, From, Parent, ?MODULE, Debug, State);
|
||||
Unexpected ->
|
||||
ok = io:format("~p Unexpected message: ~tp", [self(), Unexpected]),
|
||||
loop(Parent, Debug, State)
|
||||
end.
|
||||
|
||||
|
||||
-spec system_continue(Parent, Debug, State) -> no_return()
|
||||
when Parent :: pid(),
|
||||
Debug :: [sys:dbg_opt()],
|
||||
State :: state().
|
||||
%% @private
|
||||
%% The function called by the OTP internal functions after a system message has been
|
||||
%% handled. If the worker process has several possible states this is one place
|
||||
%% resumption of a specific state can be specified and dispatched.
|
||||
|
||||
system_continue(Parent, Debug, State) ->
|
||||
loop(Parent, Debug, State).
|
||||
|
||||
|
||||
-spec system_terminate(Reason, Parent, Debug, State) -> no_return()
|
||||
when Reason :: term(),
|
||||
Parent :: pid(),
|
||||
Debug :: [sys:dbg_opt()],
|
||||
State :: state().
|
||||
%% @private
|
||||
%% Called by the OTP inner bits to allow the process to terminate gracefully.
|
||||
%% Exactly when and if this is callback gets called is specified in the docs:
|
||||
%% See: http://erlang.org/doc/design_principles/spec_proc.html#msg
|
||||
|
||||
system_terminate(Reason, _Parent, _Debug, _State) ->
|
||||
exit(Reason).
|
||||
|
||||
|
||||
|
||||
-spec system_get_state(State) -> {ok, State}
|
||||
when State :: state().
|
||||
%% @private
|
||||
%% This function allows the runtime (or anything else) to inspect the running state
|
||||
%% of the worker process at any arbitrary time.
|
||||
|
||||
system_get_state(State) -> {ok, State}.
|
||||
|
||||
|
||||
-spec system_replace_state(StateFun, State) -> {ok, NewState, State}
|
||||
when StateFun :: fun(),
|
||||
State :: state(),
|
||||
NewState :: term().
|
||||
%% @private
|
||||
%% This function allows the system to update the process state in-place. This is most
|
||||
%% useful for state transitions between code types, like when performing a hot update
|
||||
%% (very cool, but sort of hard) or hot patching a running system (living on the edge!).
|
||||
|
||||
system_replace_state(StateFun, State) ->
|
||||
{ok, StateFun(State), State}.
|
||||
|
||||
|
||||
|
||||
%%% http request handling
|
||||
|
||||
handle_request(Sock, R = #request{method = M, path = P}) when M =/= undefined, P =/= undefined ->
|
||||
tell("~p ~ts", [M, P]),
|
||||
route(Sock, M, P, R).
|
||||
|
||||
|
||||
route(Sock, get, Route, _Request) ->
|
||||
case Route of
|
||||
<<"/">> -> home(Sock);
|
||||
<<"/default.css">> -> default_css(Sock);
|
||||
_ -> http_err(Sock, 404)
|
||||
end;
|
||||
route(Sock, post, Route, Request) ->
|
||||
case Route of
|
||||
<<"/wfcin">> -> wfcin(Sock, Request);
|
||||
_ -> http_err(Sock, 404)
|
||||
end;
|
||||
route(Sock, _, _, _) ->
|
||||
http_err(Sock, 404).
|
||||
|
||||
|
||||
home(Sock) ->
|
||||
%% fixme: cache
|
||||
Path_IH = filename:join([zx:get_home(), "priv", "index.html"]),
|
||||
case file:read_file(Path_IH) of
|
||||
{ok, Body} ->
|
||||
Resp = #response{headers = [{"content-type", "text/html"}],
|
||||
body = Body},
|
||||
respond(Sock, Resp);
|
||||
Error ->
|
||||
tell("error: ~p~n", [self(), Error]),
|
||||
http_err(Sock, 500)
|
||||
end.
|
||||
|
||||
default_css(Sock) ->
|
||||
%% fixme: cache
|
||||
Path_IH = filename:join([zx:get_home(), "priv", "default.css"]),
|
||||
case file:read_file(Path_IH) of
|
||||
{ok, Body} ->
|
||||
Resp = #response{headers = [{"content-type", "text/css"}],
|
||||
body = Body},
|
||||
respond(Sock, Resp);
|
||||
Error ->
|
||||
io:format("~p error: ~p~n", [self(), Error]),
|
||||
http_err(Sock, 500)
|
||||
end.
|
||||
|
||||
wfcin(Sock, #request{enctype = json,
|
||||
cookies = Cookies,
|
||||
body = #{"wfcin" := Input}}) ->
|
||||
tell("wfcin good request: ~tp", [Input]),
|
||||
{Cookie, Ctx0} = ctx(Cookies),
|
||||
{RespObj, NewCtx} =
|
||||
%% FIXME: this should really be a new process
|
||||
try
|
||||
case wfc_read:expr(Input) of
|
||||
{ok, Expr, _Rest} ->
|
||||
case wfc_eval:eval(Expr, Ctx0) of
|
||||
{ok, noop, Ctx1} -> {jsgud("<noop>"), Ctx1};
|
||||
{ok, Sentence, Ctx1} -> {jsgud(wfc_pp:sentence(Sentence)), Ctx1};
|
||||
{error, Message} -> {jsbad(Message), Ctx0}
|
||||
end;
|
||||
{error, Message} ->
|
||||
{jsbad(Message), Ctx0}
|
||||
end
|
||||
catch
|
||||
error:E:S ->
|
||||
ErrorMessage = unicode:characters_to_list(io_lib:format("parser crashed: ~p:~p", [E, S])),
|
||||
{jsbad(ErrorMessage), Ctx0}
|
||||
end,
|
||||
% update cache with new context
|
||||
ok = fd_cache:set(Cookie, NewCtx),
|
||||
Body = zj:encode(RespObj),
|
||||
Response = #response{headers = [{"content-type", "application/json"},
|
||||
{"set-cookie", ["wfc=", Cookie]}],
|
||||
body = Body},
|
||||
respond(Sock, Response);
|
||||
wfcin(Sock, Request) ->
|
||||
tell("wfcin: bad request: ~tp", [Request]),
|
||||
http_err(Sock, 400).
|
||||
|
||||
|
||||
ctx(#{<<"wfc">> := Cookie}) ->
|
||||
case fd_cache:query(Cookie) of
|
||||
{ok, Context} -> {Cookie, Context};
|
||||
error -> {Cookie, wfc_eval_context:default()}
|
||||
end;
|
||||
ctx(_) ->
|
||||
{new_cookie(), wfc_eval_context:default()}.
|
||||
|
||||
new_cookie() ->
|
||||
binary:encode_hex(crypto:strong_rand_bytes(8)).
|
||||
|
||||
jsgud(X) ->
|
||||
#{"ok" => true,
|
||||
"result" => X}.
|
||||
|
||||
jsbad(X) ->
|
||||
#{"ok" => false,
|
||||
"error" => X}.
|
||||
|
||||
http_err(Sock, N) ->
|
||||
Slogan = qhl:slogan(N),
|
||||
Body = ["<!doctype html>"
|
||||
"<html lang=\"en\">"
|
||||
"<head>"
|
||||
"<meta charset=\"utf-8\">"
|
||||
"<title>QHL: ", integer_to_list(N), " ", Slogan, "</title>"
|
||||
"</head>"
|
||||
"<body>"
|
||||
"<h1>"
|
||||
"QHL: ", integer_to_list(N), " ", Slogan,
|
||||
"</h1>"
|
||||
"</body>"
|
||||
"</html>"],
|
||||
Resp = #response{code = N,
|
||||
headers = [{"content/type", "text/html"}],
|
||||
body = Body},
|
||||
respond(Sock, Resp).
|
||||
|
||||
|
||||
respond(Sock, Response) ->
|
||||
gen_tcp:send(Sock, fmtresp(Response)).
|
||||
|
||||
|
||||
fmtresp(#response{type = page, %% no idea what {data, String} is
|
||||
version = http11,
|
||||
code = Code,
|
||||
headers = Hs,
|
||||
body = Body}) ->
|
||||
%% need byte size for binary
|
||||
Headers = add_headers(Hs, Body),
|
||||
[io_lib:format("HTTP/1.1 ~tp ~ts", [Code, qhl:slogan(Code)]), "\r\n",
|
||||
[io_lib:format("~ts: ~ts\r\n", [K, V]) || {K, V} <- Headers],
|
||||
"\r\n",
|
||||
Body].
|
||||
|
||||
|
||||
%% body needed just for size
|
||||
add_headers(Hs, Body) ->
|
||||
Defaults = default_headers(Body),
|
||||
Hs2 = proplists:to_map(Hs),
|
||||
proplists:from_map(maps:merge(Defaults, Hs2)).
|
||||
|
||||
|
||||
default_headers(Body) ->
|
||||
BodySize = byte_size(iolist_to_binary(Body)),
|
||||
#{"Server" => "fewd 0.1.0",
|
||||
"Date" => qhl:ridiculous_web_date(),
|
||||
"Content-Length" => io_lib:format("~p", [BodySize])}.
|
||||
@@ -0,0 +1,46 @@
|
||||
-module(fd_httpd).
|
||||
-vsn("0.2.0").
|
||||
-behaviour(supervisor).
|
||||
-author("Peter Harpending <peterharpending@qpq.swiss>").
|
||||
-copyright("Peter Harpending <peterharpending@qpq.swiss>").
|
||||
-license("BSD-2-Clause-FreeBSD").
|
||||
|
||||
-export([start_link/0]).
|
||||
-export([init/1]).
|
||||
|
||||
|
||||
-spec start_link() -> {ok, pid()}.
|
||||
%% @private
|
||||
%% This supervisor's own start function.
|
||||
|
||||
start_link() ->
|
||||
supervisor:start_link({local, ?MODULE}, ?MODULE, []).
|
||||
|
||||
|
||||
-spec init([]) -> {ok, {supervisor:sup_flags(), [supervisor:child_spec()]}}.
|
||||
%% @private
|
||||
%% The OTP init/1 function.
|
||||
|
||||
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,
|
||||
5000,
|
||||
worker,
|
||||
[fd_httpd_sfc]},
|
||||
Clients = {fd_httpd_clients,
|
||||
{fd_httpd_clients, start_link, []},
|
||||
permanent,
|
||||
5000,
|
||||
supervisor,
|
||||
[fd_httpd_clients]},
|
||||
Children = [WebRTC, FileCache, Clients],
|
||||
%Children = [FileCache, Clients],
|
||||
{ok, {RestartStrategy, Children}}.
|
||||
@@ -0,0 +1,484 @@
|
||||
%%% @doc
|
||||
%%% front end web development lab Client
|
||||
%%%
|
||||
%%% An extremely naive (currently Telnet) client handler.
|
||||
%%% Unlike other modules that represent discrete processes, this one does not adhere
|
||||
%%% to any OTP behavior. It does, however, adhere to OTP.
|
||||
%%%
|
||||
%%% In some cases it is more comfortable to write socket handlers or a certain
|
||||
%%% category of state machines as "pure" Erlang processes. This approach is made
|
||||
%%% OTP-able by use of the proc_lib module, which is the underlying library used
|
||||
%%% to write the stdlib's behaviors like gen_server, gen_statem, gen_fsm, etc.
|
||||
%%%
|
||||
%%% http://erlang.org/doc/design_principles/spec_proc.html
|
||||
%%% @end
|
||||
|
||||
-module(fd_httpd_client).
|
||||
-vsn("0.2.0").
|
||||
-author("Peter Harpending <peterharpending@qpq.swiss>").
|
||||
-copyright("Peter Harpending <peterharpending@qpq.swiss>").
|
||||
-license("BSD-2-Clause-FreeBSD").
|
||||
|
||||
-export([start/1]).
|
||||
-export([start_link/1, init/2]).
|
||||
-export([system_continue/3, system_terminate/4,
|
||||
system_get_state/1, system_replace_state/2]).
|
||||
|
||||
|
||||
%%% Type and Record Definitions
|
||||
|
||||
-include("http.hrl").
|
||||
-include("$zx_include/zx_logger.hrl").
|
||||
|
||||
|
||||
-record(s, {socket = none :: none | gen_tcp:socket(),
|
||||
next = <<>> :: binary()}).
|
||||
|
||||
|
||||
%% An alias for the state record above. Aliasing state can smooth out annoyances
|
||||
%% that can arise from using the record directly as its own type all over the code.
|
||||
|
||||
-type state() :: #s{}.
|
||||
|
||||
|
||||
%%% Service Interface
|
||||
|
||||
|
||||
-spec start(ListenSocket) -> Result
|
||||
when ListenSocket :: gen_tcp:socket(),
|
||||
Result :: {ok, pid()}
|
||||
| {error, Reason},
|
||||
Reason :: {already_started, pid()}
|
||||
| {shutdown, term()}
|
||||
| term().
|
||||
%% @private
|
||||
%% How the fd_httpd_client_man or a prior fd_httpd_client kicks things off.
|
||||
%% This is called in the context of fd_httpd_client_man or the prior fd_httpd_client.
|
||||
|
||||
start(ListenSocket) ->
|
||||
fd_httpd_client_sup:start_acceptor(ListenSocket).
|
||||
|
||||
|
||||
-spec start_link(ListenSocket) -> Result
|
||||
when ListenSocket :: gen_tcp:socket(),
|
||||
Result :: {ok, pid()}
|
||||
| {error, Reason},
|
||||
Reason :: {already_started, pid()}
|
||||
| {shutdown, term()}
|
||||
| term().
|
||||
%% @private
|
||||
%% This is called by the fd_httpd_client_sup. While start/1 is called to iniate a startup
|
||||
%% (essentially requesting a new worker be started by the supervisor), this is
|
||||
%% actually called in the context of the supervisor.
|
||||
|
||||
start_link(ListenSocket) ->
|
||||
proc_lib:start_link(?MODULE, init, [self(), ListenSocket]).
|
||||
|
||||
|
||||
-spec init(Parent, ListenSocket) -> no_return()
|
||||
when Parent :: pid(),
|
||||
ListenSocket :: gen_tcp:socket().
|
||||
%% @private
|
||||
%% This is the first code executed in the context of the new worker itself.
|
||||
%% This function does not have any return value, as the startup return is
|
||||
%% passed back to the supervisor by calling proc_lib:init_ack/2.
|
||||
%% We see the initial form of the typical arity-3 service loop form here in the
|
||||
%% call to listen/3.
|
||||
|
||||
init(Parent, ListenSocket) ->
|
||||
ok = tell("~p Listening.~n", [self()]),
|
||||
Debug = sys:debug_options([]),
|
||||
ok = proc_lib:init_ack(Parent, {ok, self()}),
|
||||
listen(Parent, Debug, ListenSocket).
|
||||
|
||||
|
||||
-spec listen(Parent, Debug, ListenSocket) -> no_return()
|
||||
when Parent :: pid(),
|
||||
Debug :: [sys:dbg_opt()],
|
||||
ListenSocket :: gen_tcp:socket().
|
||||
%% @private
|
||||
%% This function waits for a TCP connection. The owner of the socket is still
|
||||
%% the fd_httpd_client_man (so it can still close it on a call to fd_httpd_client_man:ignore/0),
|
||||
%% but the only one calling gen_tcp:accept/1 on it is this process. Closing the socket
|
||||
%% is one way a manager process can gracefully unblock child workers that are blocking
|
||||
%% on a network accept.
|
||||
%%
|
||||
%% Once it makes a TCP connection it will call start/1 to spawn its successor.
|
||||
|
||||
listen(Parent, Debug, ListenSocket) ->
|
||||
case gen_tcp:accept(ListenSocket) of
|
||||
{ok, Socket} ->
|
||||
{ok, _} = start(ListenSocket),
|
||||
{ok, Peer} = inet:peername(Socket),
|
||||
ok = tell("~p Connection accepted from: ~p~n", [self(), Peer]),
|
||||
ok = fd_httpd_client_man:enroll(),
|
||||
State = #s{socket = Socket},
|
||||
loop(Parent, Debug, State);
|
||||
{error, closed} ->
|
||||
ok = tell("~p Retiring: Listen socket closed.~n", [self()]),
|
||||
exit(normal)
|
||||
end.
|
||||
|
||||
|
||||
-spec loop(Parent, Debug, State) -> no_return()
|
||||
when Parent :: pid(),
|
||||
Debug :: [sys:dbg_opt()],
|
||||
State :: state().
|
||||
%% @private
|
||||
%% The service loop itself. This is the service state. The process blocks on receive
|
||||
%% of Erlang messages, TCP segments being received themselves as Erlang messages.
|
||||
|
||||
loop(Parent, Debug, State = #s{socket = Socket, next = Next0}) ->
|
||||
ok = inet:setopts(Socket, [{active, once}]),
|
||||
receive
|
||||
{tcp, Socket, Message} ->
|
||||
Received = <<Next0/binary, Message/binary>>,
|
||||
case qhl:parse(Socket, Received) of
|
||||
{ok, Req, Next1} ->
|
||||
%% FIXME: unfuck received logic here
|
||||
%% 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
|
||||
tell(error, "~p QHL parse error: ~tp", [?LINE, Error]),
|
||||
tell(error, "~p bad request:~n~ts", [?LINE, Received]),
|
||||
fd_httpd_utils:http_err(Socket, 400),
|
||||
gen_tcp:shutdown(Socket, read_write),
|
||||
exit(normal)
|
||||
end;
|
||||
{tcp_closed, Socket} ->
|
||||
ok = tell("~p Socket closed, retiring.~n", [self()]),
|
||||
exit(normal);
|
||||
{system, From, Request} ->
|
||||
sys:handle_system_msg(Request, From, Parent, ?MODULE, Debug, State);
|
||||
Unexpected ->
|
||||
ok = tell("~p Unexpected message: ~tp", [self(), Unexpected]),
|
||||
loop(Parent, Debug, State)
|
||||
end.
|
||||
|
||||
|
||||
-spec system_continue(Parent, Debug, State) -> no_return()
|
||||
when Parent :: pid(),
|
||||
Debug :: [sys:dbg_opt()],
|
||||
State :: state().
|
||||
%% @private
|
||||
%% The function called by the OTP internal functions after a system message has been
|
||||
%% handled. If the worker process has several possible states this is one place
|
||||
%% resumption of a specific state can be specified and dispatched.
|
||||
|
||||
system_continue(Parent, Debug, State) ->
|
||||
loop(Parent, Debug, State).
|
||||
|
||||
|
||||
-spec system_terminate(Reason, Parent, Debug, State) -> no_return()
|
||||
when Reason :: term(),
|
||||
Parent :: pid(),
|
||||
Debug :: [sys:dbg_opt()],
|
||||
State :: state().
|
||||
%% @private
|
||||
%% Called by the OTP inner bits to allow the process to terminate gracefully.
|
||||
%% Exactly when and if this is callback gets called is specified in the docs:
|
||||
%% See: http://erlang.org/doc/design_principles/spec_proc.html#msg
|
||||
|
||||
system_terminate(Reason, _Parent, _Debug, _State) ->
|
||||
exit(Reason).
|
||||
|
||||
|
||||
|
||||
-spec system_get_state(State) -> {ok, State}
|
||||
when State :: state().
|
||||
%% @private
|
||||
%% This function allows the runtime (or anything else) to inspect the running state
|
||||
%% of the worker process at any arbitrary time.
|
||||
|
||||
system_get_state(State) -> {ok, State}.
|
||||
|
||||
|
||||
-spec system_replace_state(StateFun, State) -> {ok, NewState, State}
|
||||
when StateFun :: fun(),
|
||||
State :: state(),
|
||||
NewState :: term().
|
||||
%% @private
|
||||
%% This function allows the system to update the process state in-place. This is most
|
||||
%% useful for state transitions between code types, like when performing a hot update
|
||||
%% (very cool, but sort of hard) or hot patching a running system (living on the edge!).
|
||||
|
||||
system_replace_state(StateFun, State) ->
|
||||
{ok, StateFun(State), State}.
|
||||
|
||||
|
||||
|
||||
%%% http request handling
|
||||
|
||||
-spec handle_request(Sock, Request, Received) -> NewReceived
|
||||
when Sock :: gen_tcp:socket(),
|
||||
Request :: request(),
|
||||
Received :: binary(),
|
||||
NewReceived :: binary().
|
||||
|
||||
handle_request(Sock, R = #request{method = M, path = P}, Received) when M =/= undefined, P =/= undefined ->
|
||||
tell("~tp ~tp ~ts", [self(), M, P]),
|
||||
route(Sock, M, P, R, Received).
|
||||
|
||||
|
||||
|
||||
-spec route(Sock, Method, Route, Request, Received) -> NewReceived
|
||||
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/webrtc">> -> ws_webrtc(Sock, Request, Received) , Received;
|
||||
<<"/">> -> route_static(Sock, <<"/index.html">>) , Received;
|
||||
_ -> route_static(Sock, Route) , Received
|
||||
end;
|
||||
route(Sock, post, Route, Request, Received) ->
|
||||
case Route of
|
||||
<<"/wfcin">> -> wfcin(Sock, Request) , Received;
|
||||
_ -> fd_httpd_utils:http_err(Sock, 404) , Received
|
||||
end;
|
||||
route(Sock, _, _, _, Received) ->
|
||||
fd_httpd_utils:http_err(Sock, 404),
|
||||
Received.
|
||||
|
||||
|
||||
|
||||
-spec route_static(Socket, Route) -> ok
|
||||
when Socket :: gen_tcp:socket(),
|
||||
Route :: binary().
|
||||
|
||||
route_static(Sock, Route) ->
|
||||
respond_static(Sock, fd_httpd_sfc:query(Route)).
|
||||
|
||||
|
||||
|
||||
-spec respond_static(Sock, MaybeEty) -> ok
|
||||
when Sock :: gen_tcp:socket(),
|
||||
MaybeEty :: fd_httpd_sfc:maybe_entry().
|
||||
|
||||
respond_static(Sock, {found, Entry}) ->
|
||||
% -record(e, {fs_path :: file:filename(),
|
||||
% last_modified :: file:date_time(),
|
||||
% mime_type :: string(),
|
||||
% encoding :: encoding(),
|
||||
% contents :: binary()}).
|
||||
Headers0 =
|
||||
case fd_httpd_sfc_entry:encoding(Entry) of
|
||||
gzip -> [{"content-encoding", "gzip"}];
|
||||
none -> []
|
||||
end,
|
||||
Headers1 = [{"content-type", fd_httpd_sfc_entry:mime_type(Entry)} | Headers0],
|
||||
Response = #response{headers = Headers1,
|
||||
body = fd_httpd_sfc_entry:contents(Entry)},
|
||||
fd_httpd_utils:respond(Sock, Response);
|
||||
respond_static(Sock, not_found) ->
|
||||
fd_httpd_utils:http_err(Sock, 404).
|
||||
|
||||
|
||||
%% ------------------------------
|
||||
%% webrtc
|
||||
%% ------------------------------
|
||||
|
||||
-record(rs,
|
||||
{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});
|
||||
Error ->
|
||||
tell("ws_webrtc: error: ~tp", [Error]),
|
||||
fd_httpd_utils:http_err(Sock, 400)
|
||||
end
|
||||
catch
|
||||
X:Y:Z ->
|
||||
tell(error, "CRASH ws_webrtc: ~tp:~tp:~tp", [X, Y, Z]),
|
||||
fd_httpd_utils:http_err(Sock, 500)
|
||||
end.
|
||||
|
||||
|
||||
-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,
|
||||
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,
|
||||
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.
|
||||
|
||||
|
||||
%% ------------------------------
|
||||
%% echo
|
||||
%% ------------------------------
|
||||
|
||||
ws_echo(Sock, Request) ->
|
||||
try
|
||||
ws_echo2(Sock, Request)
|
||||
catch
|
||||
X:Y:Z ->
|
||||
tell(error, "CRASH ws_echo: ~tp:~tp:~tp", [X, Y, Z]),
|
||||
fd_httpd_utils:http_err(Sock, 500)
|
||||
end.
|
||||
|
||||
ws_echo2(Sock, Request) ->
|
||||
case qhl_ws:handshake(Request) of
|
||||
{ok, Response} ->
|
||||
fd_httpd_utils:respond(Sock, Response),
|
||||
ws_echo_loop(Sock);
|
||||
Error ->
|
||||
tell("ws_echo: error: ~tp", [Error]),
|
||||
fd_httpd_utils:http_err(Sock, 400)
|
||||
end.
|
||||
|
||||
ws_echo_loop(Sock) ->
|
||||
ws_echo_loop(Sock, [], <<>>).
|
||||
|
||||
ws_echo_loop(Sock, Frames, Received) ->
|
||||
tell("~p ws_echo_loop(Sock, ~tp, ~tp)", [self(), Frames, Received]),
|
||||
case qhl_ws:recv(Sock, Received, 5*qhl_ws:min(), Frames) of
|
||||
{ok, Message, NewFrames, NewReceived} ->
|
||||
tell("~p echo message: ~tp", [self(), Message]),
|
||||
% send the same message back
|
||||
ok = qhl_ws:send(Sock, Message),
|
||||
ws_echo_loop(Sock, NewFrames, NewReceived);
|
||||
Error ->
|
||||
tell(error, "ws_echo_loop: error: ~tp", [Error]),
|
||||
qhl_ws:send(Sock, {close, <<>>}),
|
||||
error(Error)
|
||||
end.
|
||||
|
||||
|
||||
%% ------------------------------
|
||||
%% wfc
|
||||
%% ------------------------------
|
||||
|
||||
wfcin(Sock, #request{enctype = json,
|
||||
cookies = Cookies,
|
||||
body = #{"wfcin" := Input}}) ->
|
||||
tell("wfcin good request: ~tp", [Input]),
|
||||
{Cookie, Ctx0} = ctx(Cookies),
|
||||
{RespObj, NewCtx} =
|
||||
%% FIXME: this should really be a new process
|
||||
try
|
||||
case wfc_read:expr(Input) of
|
||||
{ok, Expr, _Rest} ->
|
||||
case wfc_eval:eval(Expr, Ctx0) of
|
||||
{ok, noop, Ctx1} -> {fd_httpd_utils:jsgud("<noop>"), Ctx1};
|
||||
{ok, Sentence, Ctx1} -> {fd_httpd_utils:jsgud(wfc_pp:sentence(Sentence)), Ctx1};
|
||||
{error, Message} -> {fd_httpd_utils:jsbad(Message), Ctx0}
|
||||
end;
|
||||
{error, Message} ->
|
||||
{fd_httpd_utils:jsbad(Message), Ctx0}
|
||||
end
|
||||
catch
|
||||
error:E:S ->
|
||||
ErrorMessage = unicode:characters_to_list(io_lib:format("parser crashed: ~p:~p", [E, S])),
|
||||
{fd_httpd_utils:jsbad(ErrorMessage), Ctx0}
|
||||
end,
|
||||
% update cache with new context
|
||||
ok = fd_wfcd_cache:set(Cookie, NewCtx),
|
||||
Body = zj:encode(RespObj),
|
||||
Response = #response{headers = [{"content-type", "application/json"},
|
||||
{"set-cookie", ["wfc=", Cookie]}],
|
||||
body = Body},
|
||||
fd_httpd_utils:respond(Sock, Response);
|
||||
wfcin(Sock, Request) ->
|
||||
tell("wfcin: bad request: ~tp", [Request]),
|
||||
fd_httpd_utils:http_err(Sock, 400).
|
||||
|
||||
|
||||
|
||||
-spec ctx(Cookies) -> {Cookie, Context}
|
||||
when Cookies :: #{binary() := Cookie},
|
||||
Cookie :: binary(),
|
||||
Context :: wfc_eval_context:context().
|
||||
|
||||
ctx(#{<<"wfc">> := Cookie}) ->
|
||||
case fd_wfcd_cache:query(Cookie) of
|
||||
{ok, Context} -> {Cookie, Context};
|
||||
error -> {Cookie, wfc_eval_context:default()}
|
||||
end;
|
||||
ctx(_) ->
|
||||
{fd_httpd_utils:new_cookie(), wfc_eval_context:default()}.
|
||||
@@ -9,8 +9,8 @@
|
||||
%%% OTP should take care of for us.
|
||||
%%% @end
|
||||
|
||||
-module(fd_client_man).
|
||||
-vsn("0.1.0").
|
||||
-module(fd_httpd_client_man).
|
||||
-vsn("0.2.0").
|
||||
-behavior(gen_server).
|
||||
-author("Peter Harpending <peterharpending@qpq.swiss>").
|
||||
-copyright("Peter Harpending <peterharpending@qpq.swiss>").
|
||||
@@ -23,6 +23,8 @@
|
||||
code_change/3, terminate/2]).
|
||||
|
||||
|
||||
-include("$zx_include/zx_logger.hrl").
|
||||
|
||||
%%% Type and Record Definitions
|
||||
|
||||
|
||||
@@ -92,7 +94,7 @@ echo(Message) ->
|
||||
when Result :: {ok, pid()}
|
||||
| {error, Reason :: term()}.
|
||||
%% @private
|
||||
%% This should only ever be called by fd_clients (the service-level supervisor).
|
||||
%% This should only ever be called by fd_httpd_clients (the service-level supervisor).
|
||||
|
||||
start_link() ->
|
||||
gen_server:start_link({local, ?MODULE}, ?MODULE, none, []).
|
||||
@@ -104,8 +106,9 @@ start_link() ->
|
||||
%% preparatory work necessary for proper function.
|
||||
|
||||
init(none) ->
|
||||
ok = io:format("Starting.~n"),
|
||||
ok = tell("Starting fd_httpd_client_man."),
|
||||
State = #s{},
|
||||
ok = tell("fd_httpd_client_man init state: ~tp", [State]),
|
||||
{ok, State}.
|
||||
|
||||
|
||||
@@ -130,7 +133,7 @@ handle_call({listen, PortNum}, _, State) ->
|
||||
{Response, NewState} = do_listen(PortNum, State),
|
||||
{reply, Response, NewState};
|
||||
handle_call(Unexpected, From, State) ->
|
||||
ok = io:format("~p Unexpected call from ~tp: ~tp~n", [self(), From, Unexpected]),
|
||||
ok = tell("~p Unexpected call from ~tp: ~tp~n", [self(), From, Unexpected]),
|
||||
{noreply, State}.
|
||||
|
||||
|
||||
@@ -152,7 +155,7 @@ handle_cast(ignore, State) ->
|
||||
NewState = do_ignore(State),
|
||||
{noreply, NewState};
|
||||
handle_cast(Unexpected, State) ->
|
||||
ok = io:format("~p Unexpected cast: ~tp~n", [self(), Unexpected]),
|
||||
ok = tell("~p Unexpected cast: ~tp~n", [self(), Unexpected]),
|
||||
{noreply, State}.
|
||||
|
||||
|
||||
@@ -168,7 +171,7 @@ handle_info({'DOWN', Mon, process, Pid, Reason}, State) ->
|
||||
NewState = handle_down(Mon, Pid, Reason, State),
|
||||
{noreply, NewState};
|
||||
handle_info(Unexpected, State) ->
|
||||
ok = io:format("~p Unexpected info: ~tp~n", [self(), Unexpected]),
|
||||
ok = tell("~p Unexpected info: ~tp~n", [self(), Unexpected]),
|
||||
{noreply, State}.
|
||||
|
||||
|
||||
@@ -225,10 +228,10 @@ do_listen(PortNum, State = #s{port_num = none}) ->
|
||||
{keepalive, true},
|
||||
{reuseaddr, true}],
|
||||
{ok, Listener} = gen_tcp:listen(PortNum, SocketOptions),
|
||||
{ok, _} = fd_client:start(Listener),
|
||||
{ok, _} = fd_httpd_client:start(Listener),
|
||||
{ok, State#s{port_num = PortNum, listener = Listener}};
|
||||
do_listen(_, State = #s{port_num = PortNum}) ->
|
||||
ok = io:format("~p Already listening on ~p~n", [self(), PortNum]),
|
||||
ok = tell("~p Already listening on ~p~n", [self(), PortNum]),
|
||||
{{error, {listening, PortNum}}, State}.
|
||||
|
||||
|
||||
@@ -254,7 +257,7 @@ do_enroll(Pid, State = #s{clients = Clients}) ->
|
||||
case lists:member(Pid, Clients) of
|
||||
false ->
|
||||
Mon = monitor(process, Pid),
|
||||
ok = io:format("Monitoring ~tp @ ~tp~n", [Pid, Mon]),
|
||||
ok = tell("Monitoring ~tp @ ~tp~n", [Pid, Mon]),
|
||||
State#s{clients = [Pid | Clients]};
|
||||
true ->
|
||||
State
|
||||
@@ -292,6 +295,6 @@ handle_down(Mon, Pid, Reason, State = #s{clients = Clients}) ->
|
||||
State#s{clients = NewClients};
|
||||
false ->
|
||||
Unexpected = {'DOWN', Mon, process, Pid, Reason},
|
||||
ok = io:format("~p Unexpected info: ~tp~n", [self(), Unexpected]),
|
||||
ok = tell("~p Unexpected info: ~tp~n", [self(), Unexpected]),
|
||||
State
|
||||
end.
|
||||
@@ -2,8 +2,8 @@
|
||||
%%% front end web development lab Client Supervisor
|
||||
%%%
|
||||
%%% This process supervises the client socket handlers themselves. It is a peer of the
|
||||
%%% fd_client_man (the manager interface to this network service component),
|
||||
%%% and a child of the supervisor named fd_clients.
|
||||
%%% fd_httpd_client_man (the manager interface to this network service component),
|
||||
%%% and a child of the supervisor named fd_httpd_clients.
|
||||
%%%
|
||||
%%% Because we don't know (or care) how many client connections the server may end up
|
||||
%%% handling this is a simple_one_for_one supervisor which can spawn and manage as
|
||||
@@ -13,8 +13,8 @@
|
||||
%%% http://erlang.org/doc/design_principles/sup_princ.html#id79244
|
||||
%%% @end
|
||||
|
||||
-module(fd_client_sup).
|
||||
-vsn("0.1.0").
|
||||
-module(fd_httpd_client_sup).
|
||||
-vsn("0.2.0").
|
||||
-behaviour(supervisor).
|
||||
-author("Peter Harpending <peterharpending@qpq.swiss>").
|
||||
-copyright("Peter Harpending <peterharpending@qpq.swiss>").
|
||||
@@ -35,9 +35,9 @@
|
||||
| {shutdown, term()}
|
||||
| term().
|
||||
%% @private
|
||||
%% Spawns the first listener at the request of the fd_client_man when
|
||||
%% Spawns the first listener at the request of the fd_httpd_client_man when
|
||||
%% fewd:listen/1 is called, or the next listener at the request of the
|
||||
%% currently listening fd_client when a connection is made.
|
||||
%% currently listening fd_httpd_client when a connection is made.
|
||||
%%
|
||||
%% Error conditions, supervision strategies and other important issues are
|
||||
%% explained in the supervisor module docs:
|
||||
@@ -61,10 +61,10 @@ start_link() ->
|
||||
|
||||
init(none) ->
|
||||
RestartStrategy = {simple_one_for_one, 1, 60},
|
||||
Client = {fd_client,
|
||||
{fd_client, start_link, []},
|
||||
Client = {fd_httpd_client,
|
||||
{fd_httpd_client, start_link, []},
|
||||
temporary,
|
||||
brutal_kill,
|
||||
worker,
|
||||
[fd_client]},
|
||||
[fd_httpd_client]},
|
||||
{ok, {RestartStrategy, [Client]}}.
|
||||
@@ -8,8 +8,8 @@
|
||||
%%% See: http://erlang.org/doc/apps/kernel/application.html
|
||||
%%% @end
|
||||
|
||||
-module(fd_clients).
|
||||
-vsn("0.1.0").
|
||||
-module(fd_httpd_clients).
|
||||
-vsn("0.2.0").
|
||||
-behavior(supervisor).
|
||||
-author("Peter Harpending <peterharpending@qpq.swiss>").
|
||||
-copyright("Peter Harpending <peterharpending@qpq.swiss>").
|
||||
@@ -32,17 +32,17 @@ start_link() ->
|
||||
|
||||
init(none) ->
|
||||
RestartStrategy = {rest_for_one, 1, 60},
|
||||
ClientMan = {fd_client_man,
|
||||
{fd_client_man, start_link, []},
|
||||
HttpClientMan = {fd_httpd_client_man,
|
||||
{fd_httpd_client_man, start_link, []},
|
||||
permanent,
|
||||
5000,
|
||||
worker,
|
||||
[fd_client_man]},
|
||||
ClientSup = {fd_client_sup,
|
||||
{fd_client_sup, start_link, []},
|
||||
[fd_httpd_client_man]},
|
||||
HttpClientSup = {fd_httpd_client_sup,
|
||||
{fd_httpd_client_sup, start_link, []},
|
||||
permanent,
|
||||
5000,
|
||||
supervisor,
|
||||
[fd_client_sup]},
|
||||
Children = [ClientSup, ClientMan],
|
||||
[fd_httpd_client_sup]},
|
||||
Children = [HttpClientSup, HttpClientMan],
|
||||
{ok, {RestartStrategy, Children}}.
|
||||
@@ -0,0 +1,112 @@
|
||||
% @doc static file cache
|
||||
-module(fd_httpd_sfc).
|
||||
-vsn("0.2.0").
|
||||
|
||||
-behavior(gen_server).
|
||||
|
||||
-export_type([
|
||||
entry/0,
|
||||
maybe_entry/0
|
||||
]).
|
||||
|
||||
-export([
|
||||
%% caller context
|
||||
base_path/0,
|
||||
renew/0, query/1,
|
||||
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").
|
||||
|
||||
-type entry() :: fd_httpd_sfc_entry:entry().
|
||||
-type maybe_entry() :: {found, fd_httpd_sfc_entry:entry()} | not_found.
|
||||
|
||||
|
||||
-record(s, {base_path = base_path() :: file:filename(),
|
||||
cache = fd_httpd_sfc_cache:new(base_path()) :: fd_httpd_sfc_cache:cache(),
|
||||
auto_renew = 0_500 :: pos_integer()}).
|
||||
%-type state() :: #s{}.
|
||||
|
||||
|
||||
%%-----------------------------------------------------------------------------
|
||||
%% caller context
|
||||
%%-----------------------------------------------------------------------------
|
||||
|
||||
-spec base_path() -> file:filename().
|
||||
base_path() ->
|
||||
filename:join([zx:get_home(), "priv", "static"]).
|
||||
|
||||
-spec renew() -> ok.
|
||||
renew() ->
|
||||
gen_server:cast(?MODULE, renew).
|
||||
|
||||
|
||||
-spec query(HttpPath) -> MaybeEntry
|
||||
when HttpPath :: binary(),
|
||||
MaybeEntry :: maybe_entry().
|
||||
query(Path) ->
|
||||
gen_server:call(?MODULE, {query, Path}).
|
||||
|
||||
|
||||
start_link() ->
|
||||
gen_server:start_link({local, ?MODULE}, ?MODULE, none, []).
|
||||
|
||||
|
||||
%%-----------------------------------------------------------------------------
|
||||
%% process context below this line
|
||||
%%-----------------------------------------------------------------------------
|
||||
|
||||
%% gen_server callbacks
|
||||
|
||||
init(none) ->
|
||||
tell("starting fd_httpd_sfc"),
|
||||
InitState = #s{},
|
||||
erlang:send_after(InitState#s.auto_renew, self(), auto_renew),
|
||||
{ok, InitState}.
|
||||
|
||||
|
||||
handle_call({query, Path}, _, State = #s{cache = Cache}) ->
|
||||
Reply = fd_httpd_sfc_cache:query(Path, Cache),
|
||||
{reply, Reply, State};
|
||||
handle_call(Unexpected, From, State) ->
|
||||
tell("~tp: unexpected call from ~tp: ~tp", [?MODULE, Unexpected, From]),
|
||||
{noreply, State}.
|
||||
|
||||
|
||||
handle_cast(renew, State) ->
|
||||
NewState = i_renew(State),
|
||||
{noreply, NewState};
|
||||
handle_cast(Unexpected, State) ->
|
||||
tell("~tp: unexpected cast: ~tp", [?MODULE, Unexpected]),
|
||||
{noreply, State}.
|
||||
|
||||
|
||||
handle_info(auto_renew, State = #s{auto_renew = MS}) ->
|
||||
log(info, "~tp: auto_renew", [?MODULE]),
|
||||
erlang:send_after(MS, self(), auto_renew),
|
||||
NewState = i_renew(State),
|
||||
{noreply, NewState};
|
||||
handle_info(Unexpected, State) ->
|
||||
tell("~tp: unexpected info: ~tp", [?MODULE, Unexpected]),
|
||||
{noreply, State}.
|
||||
|
||||
|
||||
code_change(_, State, _) ->
|
||||
{ok, State}.
|
||||
|
||||
terminate(_, _) ->
|
||||
ok.
|
||||
|
||||
|
||||
%%-----------------------------------------------------------------------------
|
||||
%% internals
|
||||
%%-----------------------------------------------------------------------------
|
||||
|
||||
i_renew(State = #s{base_path = BasePath}) ->
|
||||
NewCache = fd_httpd_sfc_cache:new(BasePath),
|
||||
NewState = State#s{cache = NewCache},
|
||||
NewState.
|
||||
@@ -0,0 +1,82 @@
|
||||
% @doc
|
||||
% cache data management
|
||||
-module(fd_httpd_sfc_cache).
|
||||
-vsn("0.2.0").
|
||||
|
||||
-export_type([
|
||||
cache/0
|
||||
]).
|
||||
|
||||
-export([
|
||||
query/2,
|
||||
new/0, new/1
|
||||
]).
|
||||
|
||||
-include("$zx_include/zx_logger.hrl").
|
||||
|
||||
-type cache() :: #{HttpPath :: binary() := Entry :: fd_httpd_sfc_entry:entry()}.
|
||||
|
||||
|
||||
-spec query(HttpPath, Cache) -> Result
|
||||
when HttpPath :: binary(),
|
||||
Cache :: cache(),
|
||||
Result :: {found, Entry}
|
||||
| not_found,
|
||||
Entry :: fd_httpd_sfc_entry:entry().
|
||||
|
||||
query(HttpPath, Cache) ->
|
||||
case maps:find(HttpPath, Cache) of
|
||||
{ok, Entry} -> {found, Entry};
|
||||
error -> not_found
|
||||
end.
|
||||
|
||||
|
||||
-spec new() -> cache().
|
||||
new() -> #{}.
|
||||
|
||||
|
||||
-spec new(BasePath) -> cache()
|
||||
when BasePath :: file:filename().
|
||||
% @doc
|
||||
% if you give a file path it just takes the parent dir
|
||||
%
|
||||
% recursively crawls through file tree and picks
|
||||
%
|
||||
% IO errors will be logged but will result in cache misses
|
||||
|
||||
new(BasePath) ->
|
||||
case filelib:is_file(BasePath) of
|
||||
true -> new2(BasePath);
|
||||
false ->
|
||||
tell("~p:new(~p): no such file or directory, returning empty cache", [?MODULE, BasePath]),
|
||||
#{}
|
||||
end.
|
||||
|
||||
new2(BasePath) ->
|
||||
BaseDir =
|
||||
case filelib:is_dir(BasePath) of
|
||||
true -> filename:absname(BasePath);
|
||||
false -> filename:absname(filename:dirname(BasePath))
|
||||
end,
|
||||
BBaseDir = unicode:characters_to_binary(BaseDir),
|
||||
HandlePath =
|
||||
fun(AbsPath, AccCache) ->
|
||||
BAbsPath = unicode:characters_to_binary(AbsPath),
|
||||
HttpPath = remove_prefix(BBaseDir, BAbsPath),
|
||||
NewCache =
|
||||
case fd_httpd_sfc_entry:new(AbsPath) of
|
||||
{found, Entry} -> maps:put(HttpPath, Entry, AccCache);
|
||||
not_found -> AccCache
|
||||
end,
|
||||
NewCache
|
||||
end,
|
||||
filelib:fold_files(_dir = BaseDir,
|
||||
_match = ".+",
|
||||
_recursive = true,
|
||||
_fun = HandlePath,
|
||||
_init_acc = #{}).
|
||||
|
||||
remove_prefix(Prefix, From) ->
|
||||
Size = byte_size(Prefix),
|
||||
<<Prefix:Size/bytes, Rest/bytes>> = From,
|
||||
Rest.
|
||||
@@ -0,0 +1,100 @@
|
||||
% @doc non-servery functions for static file caching
|
||||
%
|
||||
% this spams the filesystem, so it's not "pure" code
|
||||
-module(fd_httpd_sfc_entry).
|
||||
-vsn("0.2.0").
|
||||
|
||||
-export_type([
|
||||
encoding/0,
|
||||
entry/0
|
||||
]).
|
||||
|
||||
-export([
|
||||
%% constructor
|
||||
new/1,
|
||||
%% accessors
|
||||
fs_path/1, last_modified/1, mime_type/1, encoding/1, contents/1
|
||||
]).
|
||||
|
||||
-include("$zx_include/zx_logger.hrl").
|
||||
|
||||
%% types
|
||||
|
||||
% id = not compressed
|
||||
-type encoding() :: none | gzip.
|
||||
|
||||
-record(e, {fs_path :: file:filename(),
|
||||
last_modified :: file:date_time(),
|
||||
mime_type :: string(),
|
||||
encoding :: encoding(),
|
||||
contents :: binary()}).
|
||||
|
||||
-opaque entry() :: #e{}.
|
||||
|
||||
%% accessors
|
||||
|
||||
fs_path(#e{fs_path = X}) -> X.
|
||||
last_modified(#e{last_modified = X}) -> X.
|
||||
mime_type(#e{mime_type = X}) -> X.
|
||||
encoding(#e{encoding = X}) -> X.
|
||||
contents(#e{contents = X}) -> X.
|
||||
|
||||
%% API
|
||||
|
||||
-spec new(Path) -> Result
|
||||
when Path :: file:filename(),
|
||||
Result :: {found, entry()}
|
||||
| not_found.
|
||||
% @doc
|
||||
% absolute file path stored in resulting record
|
||||
%
|
||||
% returns not_found if ANY I/O error occurs during the process. will be logged
|
||||
|
||||
new(Path) ->
|
||||
log(info, "~tp:new(~tp)", [?MODULE, Path]),
|
||||
case file:read_file(Path) of
|
||||
{ok, Binary} ->
|
||||
{found, new2(Path, Binary)};
|
||||
Error ->
|
||||
tell("~tp:new(~tp): file read error: ~tp", [?MODULE, Path, Error]),
|
||||
not_found
|
||||
end.
|
||||
|
||||
%% can assume file exists
|
||||
new2(FsPath, FileBytes) ->
|
||||
LastModified = filelib:last_modified(FsPath),
|
||||
{Encoding, MimeType} = mimetype_compress(FsPath),
|
||||
Contents =
|
||||
case Encoding of
|
||||
none -> FileBytes;
|
||||
gzip -> zlib:gzip(FileBytes)
|
||||
end,
|
||||
#e{fs_path = FsPath,
|
||||
last_modified = LastModified,
|
||||
mime_type = MimeType,
|
||||
encoding = Encoding,
|
||||
contents = Contents}.
|
||||
|
||||
mimetype_compress(FsPath) ->
|
||||
case string:casefold(filename:extension(FsPath)) of
|
||||
%% only including the ones i anticipate encountering
|
||||
%% plaintext formats
|
||||
".css" -> {gzip, "text/css"};
|
||||
".htm" -> {gzip, "text/html"};
|
||||
".html" -> {gzip, "text/html"};
|
||||
".js" -> {gzip, "text/javascript"};
|
||||
".json" -> {gzip, "application/json"};
|
||||
".map" -> {gzip, "application/json"};
|
||||
".md" -> {gzip, "text/markdown"};
|
||||
".ts" -> {gzip, "text/x-typescript"};
|
||||
".txt" -> {gzip, "text/plain"};
|
||||
%% binary formats
|
||||
".gif" -> {none, "image/gif"};
|
||||
".jpg" -> {none, "image/jpeg"};
|
||||
".jpeg" -> {none, "image/jpeg"};
|
||||
".mp4" -> {none, "video/mp4"};
|
||||
".png" -> {none, "image/png"};
|
||||
".webm" -> {none, "video/webm"};
|
||||
".webp" -> {none, "image/webp"};
|
||||
_ -> {none, "application/octet-stream"}
|
||||
end.
|
||||
@@ -0,0 +1,119 @@
|
||||
% @doc http utility functions
|
||||
-module(fd_httpd_utils).
|
||||
-vsn("0.2.0").
|
||||
|
||||
-export([
|
||||
new_cookie/0,
|
||||
jsgud/1, jsbad/1,
|
||||
http_err/2,
|
||||
respond/2,
|
||||
fmtresp/1
|
||||
]).
|
||||
|
||||
-include("http.hrl").
|
||||
-include("$zx_include/zx_logger.hrl").
|
||||
|
||||
|
||||
-spec new_cookie() -> Cookie
|
||||
when Cookie :: binary().
|
||||
|
||||
new_cookie() ->
|
||||
binary:encode_hex(crypto:strong_rand_bytes(8)).
|
||||
|
||||
|
||||
|
||||
-spec jsgud(JSON) -> Encodable
|
||||
when JSON :: zj:value(),
|
||||
Encodable :: JSON.
|
||||
|
||||
jsgud(X) ->
|
||||
#{"ok" => true,
|
||||
"result" => X}.
|
||||
|
||||
|
||||
|
||||
-spec jsbad(JSON) -> JSBad
|
||||
when JSON :: zj:value(),
|
||||
JSBad :: zj:value().
|
||||
|
||||
jsbad(X) ->
|
||||
#{"ok" => false,
|
||||
"error" => X}.
|
||||
|
||||
|
||||
|
||||
-spec http_err(Socket, ErrorCode) -> ok
|
||||
when Socket :: gen_tcp:socket(),
|
||||
ErrorCode :: integer().
|
||||
|
||||
http_err(Sock, N) ->
|
||||
Slogan = qhl:slogan(N),
|
||||
Body = ["<!doctype html>"
|
||||
"<html lang=\"en\">"
|
||||
"<head>"
|
||||
"<meta charset=\"utf-8\">"
|
||||
"<title>QHL: ", integer_to_list(N), " ", Slogan, "</title>"
|
||||
"</head>"
|
||||
"<body>"
|
||||
"<h1>"
|
||||
"QHL: ", integer_to_list(N), " ", Slogan,
|
||||
"</h1>"
|
||||
"</body>"
|
||||
"</html>"],
|
||||
Resp = #response{code = N,
|
||||
headers = [{"content/type", "text/html"}],
|
||||
body = Body},
|
||||
respond(Sock, Resp).
|
||||
|
||||
|
||||
|
||||
-spec respond(Sock, Response) -> ok
|
||||
when Sock :: gen_tcp:socket(),
|
||||
Response :: response().
|
||||
|
||||
respond(Sock, Response = #response{code = Code}) ->
|
||||
tell("~tp ~tp ~ts", [self(), Code, qhl:slogan(Code)]),
|
||||
gen_tcp:send(Sock, fmtresp(Response)).
|
||||
|
||||
|
||||
|
||||
-spec fmtresp(Response) -> Formatted
|
||||
when Response :: response(),
|
||||
Formatted :: iolist().
|
||||
|
||||
fmtresp(#response{type = page, %% no idea what {data, String} is
|
||||
version = http11,
|
||||
code = Code,
|
||||
headers = Hs,
|
||||
body = Body}) ->
|
||||
%% need byte size for binary
|
||||
Headers = add_headers(Hs, Body),
|
||||
[io_lib:format("HTTP/1.1 ~tp ~ts", [Code, qhl:slogan(Code)]), "\r\n",
|
||||
[io_lib:format("~ts: ~ts\r\n", [K, V]) || {K, V} <- Headers],
|
||||
"\r\n",
|
||||
Body].
|
||||
|
||||
|
||||
|
||||
-spec add_headers(Existing, Body) -> Hdrs
|
||||
when Existing :: [{iolist(), iolist()}],
|
||||
Body :: iolist(),
|
||||
Hdrs :: [{iolist(), iolist()}].
|
||||
|
||||
%% body needed just for size
|
||||
add_headers(Hs, Body) ->
|
||||
Defaults = default_headers(Body),
|
||||
Hs2 = proplists:to_map(Hs),
|
||||
proplists:from_map(maps:merge(Defaults, Hs2)).
|
||||
|
||||
|
||||
|
||||
-spec default_headers(Body) -> HdrsMap
|
||||
when Body :: iolist(),
|
||||
HdrsMap :: #{iolist() := iolist()}.
|
||||
|
||||
default_headers(Body) ->
|
||||
BodySize = byte_size(iolist_to_binary(Body)),
|
||||
#{"Server" => "fewd 0.2.0",
|
||||
"Date" => qhl:ridiculous_web_date(),
|
||||
"Content-Length" => io_lib:format("~p", [BodySize])}.
|
||||
@@ -0,0 +1,174 @@
|
||||
% @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).
|
||||
+9
-9
@@ -12,7 +12,7 @@
|
||||
%%% @end
|
||||
|
||||
-module(fd_sup).
|
||||
-vsn("0.1.0").
|
||||
-vsn("0.2.0").
|
||||
-behaviour(supervisor).
|
||||
-author("Peter Harpending <peterharpending@qpq.swiss>").
|
||||
-copyright("Peter Harpending <peterharpending@qpq.swiss>").
|
||||
@@ -36,17 +36,17 @@ start_link() ->
|
||||
|
||||
init([]) ->
|
||||
RestartStrategy = {one_for_one, 1, 60},
|
||||
Clients = {fd_clients,
|
||||
{fd_clients, start_link, []},
|
||||
WFCd = {fd_wfcd,
|
||||
{fd_wfcd, start_link, []},
|
||||
permanent,
|
||||
5000,
|
||||
supervisor,
|
||||
[fd_clients]},
|
||||
Cache = {fd_cache,
|
||||
{fd_cache, start_link, []},
|
||||
[fd_wfcd]},
|
||||
Httpd = {fd_httpd,
|
||||
{fd_httpd, start_link, []},
|
||||
permanent,
|
||||
5000,
|
||||
worker,
|
||||
[fd_cache]},
|
||||
Children = [Clients, Cache],
|
||||
supervisor,
|
||||
[fd_httpd]},
|
||||
Children = [WFCd, Httpd],
|
||||
{ok, {RestartStrategy, Children}}.
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
-module(fd_wfcd).
|
||||
-vsn("0.2.0").
|
||||
-behaviour(supervisor).
|
||||
-author("Peter Harpending <peterharpending@qpq.swiss>").
|
||||
-copyright("Peter Harpending <peterharpending@qpq.swiss>").
|
||||
-license("BSD-2-Clause-FreeBSD").
|
||||
|
||||
-export([start_link/0]).
|
||||
-export([init/1]).
|
||||
|
||||
|
||||
-spec start_link() -> {ok, pid()}.
|
||||
%% @private
|
||||
%% This supervisor's own start function.
|
||||
|
||||
start_link() ->
|
||||
supervisor:start_link({local, ?MODULE}, ?MODULE, []).
|
||||
|
||||
|
||||
-spec init([]) -> {ok, {supervisor:sup_flags(), [supervisor:child_spec()]}}.
|
||||
%% @private
|
||||
%% The OTP init/1 function.
|
||||
|
||||
init([]) ->
|
||||
RestartStrategy = {one_for_one, 1, 60},
|
||||
Cache = {fd_wfcd_cache,
|
||||
{fd_wfcd_cache, start_link, []},
|
||||
permanent,
|
||||
5000,
|
||||
worker,
|
||||
[fd_wfcd_cache]},
|
||||
Children = [Cache],
|
||||
{ok, {RestartStrategy, Children}}.
|
||||
@@ -1,5 +1,6 @@
|
||||
% @doc storing map #{cookie := Context}
|
||||
-module(fd_cache).
|
||||
-module(fd_wfcd_cache).
|
||||
-vsn("0.2.0").
|
||||
|
||||
-behavior(gen_server).
|
||||
|
||||
+3
-3
@@ -3,7 +3,7 @@
|
||||
%%% @end
|
||||
|
||||
-module(fewd).
|
||||
-vsn("0.1.0").
|
||||
-vsn("0.2.0").
|
||||
-behavior(application).
|
||||
-author("Peter Harpending <peterharpending@qpq.swiss>").
|
||||
-copyright("Peter Harpending <peterharpending@qpq.swiss>").
|
||||
@@ -24,7 +24,7 @@
|
||||
%% Returns an {error, Reason} tuple if it is already listening.
|
||||
|
||||
listen(PortNum) ->
|
||||
fd_client_man:listen(PortNum).
|
||||
fd_httpd_client_man:listen(PortNum).
|
||||
|
||||
|
||||
-spec ignore() -> ok.
|
||||
@@ -32,7 +32,7 @@ listen(PortNum) ->
|
||||
%% Make the server stop listening if it is, or continue to do nothing if it isn't.
|
||||
|
||||
ignore() ->
|
||||
fd_client_man:ignore().
|
||||
fd_httpd_client_man:ignore().
|
||||
|
||||
|
||||
-spec start(normal, term()) -> {ok, pid()}.
|
||||
|
||||
+3
-24
@@ -49,62 +49,52 @@ parse(Socket, Received) ->
|
||||
%% socket.
|
||||
|
||||
parse(Socket, Received, M = #request{method = undefined}) ->
|
||||
io:format("~p parse(~p, ~p, ~p)~n", [?LINE, Socket, Received, M]),
|
||||
case read_method(Socket, Received) of
|
||||
{ok, Method, Rest} -> parse(Socket, Rest, M#request{method = Method});
|
||||
Error -> Error
|
||||
end;
|
||||
parse(Socket, Received, M = #request{path = undefined}) ->
|
||||
io:format("~p parse(~p, ~p, ~p)~n", [?LINE, Socket, Received, M]),
|
||||
case read_path(Socket, Received) of
|
||||
{ok, Path, Rest} -> parse(Socket, Rest, M#request{path = Path});
|
||||
Error -> Error
|
||||
end;
|
||||
parse(Socket, Received, M = #request{qargs = undefined}) ->
|
||||
io:format("~p parse(~p, ~p, ~p)~n", [?LINE, Socket, Received, M]),
|
||||
case read_qargs(Socket, Received) of
|
||||
{ok, Qargs, Rest} -> parse(Socket, Rest, M#request{qargs = Qargs});
|
||||
Error -> Error
|
||||
end;
|
||||
parse(Socket, Received, M = #request{fragment = undefined}) ->
|
||||
io:format("~p parse(~p, ~p, ~p)~n", [?LINE, Socket, Received, M]),
|
||||
case read_fragment(Socket, Received) of
|
||||
{ok, Fragment, Rest} -> parse(Socket, Rest, M#request{fragment = Fragment});
|
||||
Error -> Error
|
||||
end;
|
||||
parse(Socket, Received, M = #request{version = undefined}) ->
|
||||
io:format("~p parse(~p, ~p, ~p)~n", [?LINE, Socket, Received, M]),
|
||||
case read_version(Socket, Received) of
|
||||
{ok, Version, Rest} -> parse(Socket, Rest, M#request{version = Version});
|
||||
Error -> Error
|
||||
end;
|
||||
parse(Socket, Received, M = #request{headers = undefined}) ->
|
||||
io:format("~p parse(~p, ~p, ~p)~n", [?LINE, Socket, Received, M]),
|
||||
case read_headers(Socket, Received) of
|
||||
{ok, Headers, Rest} -> parse(Socket, Rest, M#request{headers = Headers});
|
||||
Error -> Error
|
||||
end;
|
||||
parse(Socket, Received, M = #request{enctype = undefined}) ->
|
||||
io:format("~p parse(~p, ~p, ~p)~n", [?LINE, Socket, Received, M]),
|
||||
case read_enctype(M) of
|
||||
{ok, Enctype} -> parse(Socket, Received, M#request{enctype = Enctype});
|
||||
Error -> Error
|
||||
end;
|
||||
parse(Socket, Received, M = #request{cookies = undefined}) ->
|
||||
io:format("~p parse(~p, ~p, ~p)~n", [?LINE, Socket, Received, M]),
|
||||
case read_cookies(M) of
|
||||
{ok, Cookies} -> parse(Socket, Received, M#request{cookies = Cookies});
|
||||
Error -> Error
|
||||
end;
|
||||
parse(Socket, Received, M = #request{size = undefined}) ->
|
||||
io:format("~p parse(~p, ~p, ~p)~n", [?LINE, Socket, Received, M]),
|
||||
case read_size(M) of
|
||||
{ok, 0} -> {ok, M#request{size = 0}, none};
|
||||
{ok, Size} -> parse(Socket, Received, M#request{size = Size});
|
||||
Error -> Error
|
||||
end;
|
||||
parse(Socket, Received, M = #request{method = get, body = undefined, size = Size}) ->
|
||||
io:format("~p parse(~p, ~p, ~p)~n", [?LINE, Socket, Received, M]),
|
||||
case read_body(Received, Size) of
|
||||
{ok, Body} -> {ok, M#request{body = Body}, none};
|
||||
{ok, Body, Next} -> {ok, M#request{body = Body}, Next};
|
||||
@@ -117,7 +107,6 @@ parse(Socket,
|
||||
method = post,
|
||||
enctype = urlencoded,
|
||||
size = Size}) ->
|
||||
io:format("~p parse(~p, ~p, ~p)~n", [?LINE, Socket, Received, M]),
|
||||
case read_body(Received, Size) of
|
||||
{ok, Body} ->
|
||||
{ok, M#request{body = parts_to_map(posted(Body))}, none};
|
||||
@@ -141,7 +130,6 @@ parse(Socket,
|
||||
method = post,
|
||||
enctype = {multipart, Boundary},
|
||||
size = Size}) ->
|
||||
io:format("~p parse(~p, ~p, ~p)~n", [?LINE, Socket, Received, M]),
|
||||
case read_multipart(Socket, Received, Boundary, Size) of
|
||||
{ok, Parts} -> {ok, M#request{body = parts_to_map(Parts)}, none};
|
||||
{ok, Parts, Next} -> {ok, M#request{body = parts_to_map(Parts)}, Next};
|
||||
@@ -153,12 +141,10 @@ parse(Socket,
|
||||
method = post,
|
||||
enctype = json,
|
||||
size = Size}) ->
|
||||
io:format("~p parse(~p, ~p, ~p)~n", [?LINE, Socket, Received, M]),
|
||||
case read_body(Received, Size) of
|
||||
{ok, Body} -> read_json(M#request{body = Body}, none);
|
||||
{ok, Body, Next} -> read_json(M#request{body = Body}, Next);
|
||||
{incomplete, Body} ->
|
||||
io:format("~p {incomplete, ~p}~n", [?LINE, Body]),
|
||||
case accumulate(Socket, M#request{body = Body}) of
|
||||
{ok, NewM = #request{body = NewBody}} ->
|
||||
read_json(NewM#request{body = NewBody}, none);
|
||||
@@ -528,7 +514,6 @@ read_size(#request{method = options}) ->
|
||||
|
||||
|
||||
read_body(Received, Size) ->
|
||||
io:format("~p read_body(~p, ~p)~n", [?LINE, Received, Size]),
|
||||
case Received of
|
||||
<<Bin:Size/binary>> ->
|
||||
{ok, Bin};
|
||||
@@ -826,11 +811,9 @@ accumulate(Socket, M = #request{size = Size, body = Body}) ->
|
||||
end.
|
||||
|
||||
accumulate(Socket, Remaining, Received) when Remaining > 0 ->
|
||||
io:format("~p accumulate(~p, ~p, ~p)~n", [?LINE, Socket, Remaining, Received]),
|
||||
ok = inet:setopts(Socket, [{active, once}]),
|
||||
receive
|
||||
{tcp, Socket, Bin} ->
|
||||
io:format("~p~n", [?LINE]),
|
||||
Size = byte_size(Bin),
|
||||
if
|
||||
Size == Remaining ->
|
||||
@@ -845,15 +828,11 @@ accumulate(Socket, Remaining, Received) when Remaining > 0 ->
|
||||
{ok, NewReceived, Next}
|
||||
end;
|
||||
{tcp_closed, Socket} ->
|
||||
io:format("~p~n", [?LINE]),
|
||||
{error, tcp_closed};
|
||||
{tcp_error, Socket, Reason} ->
|
||||
io:format("~p~n", [?LINE]),
|
||||
{error, {tcp_error, Reason}};
|
||||
X ->
|
||||
io:format("~p raseevd: ~p~n", [?LINE, X])
|
||||
after 10_000 ->
|
||||
io:format("~p~n", [?LINE]),
|
||||
{error, {tcp_error, Reason}}
|
||||
%X ->
|
||||
after 3_000 ->
|
||||
{error, timeout}
|
||||
end;
|
||||
accumulate(_, 0, Received) ->
|
||||
|
||||
+891
@@ -0,0 +1,891 @@
|
||||
% @doc websockets
|
||||
%
|
||||
% ref: https://datatracker.ietf.org/doc/html/rfc6455
|
||||
-module(qhl_ws).
|
||||
-vsn("0.2.0").
|
||||
|
||||
-export_type([
|
||||
opcode/0,
|
||||
frame/0,
|
||||
ws_msg/0
|
||||
]).
|
||||
|
||||
-export([
|
||||
%% time units
|
||||
ms/0, sec/0, min/0, hr/0, day/0,
|
||||
%% porcelain
|
||||
handshake/1,
|
||||
recv/3, recv/4,
|
||||
recv_strict/3, recv_json/3,
|
||||
send/2,
|
||||
send_dwim/2, send_json/2
|
||||
]).
|
||||
|
||||
-include("http.hrl").
|
||||
|
||||
|
||||
-define(MAX_PAYLOAD_SIZE, ((1 bsl 63) - 1)).
|
||||
|
||||
%% Frames
|
||||
%% https://datatracker.ietf.org/doc/html/rfc6455#section-5.2
|
||||
|
||||
-type opcode() :: continuation
|
||||
| text
|
||||
| binary
|
||||
| close
|
||||
| ping
|
||||
| pong.
|
||||
|
||||
-record(frame,
|
||||
{fin = none :: none | boolean(),
|
||||
rsv = none :: none | <<_:3>>,
|
||||
opcode = none :: none | opcode(),
|
||||
mask = none :: none | boolean(),
|
||||
payload_length = none :: none | non_neg_integer(),
|
||||
masking_key = none :: none | <<>> | <<_:32>>,
|
||||
payload = none :: none | binary()}).
|
||||
|
||||
-type frame() :: #frame{}.
|
||||
|
||||
|
||||
%% porcelain messages
|
||||
|
||||
-type ws_msg() :: {text, Payload :: iodata()}
|
||||
| {binary, Payload :: iodata()}
|
||||
| {close, Payload :: iodata()}
|
||||
| {ping, Payload :: iodata()}
|
||||
| {pong, Payload :: iodata()}.
|
||||
|
||||
|
||||
%% time units
|
||||
ms() -> 1.
|
||||
sec() -> 1_000.
|
||||
min() -> 60*sec().
|
||||
hr() -> 60*min().
|
||||
day() -> 24*hr().
|
||||
|
||||
|
||||
-spec handshake(Req) -> Result
|
||||
when Req :: request(),
|
||||
Result :: {ok, DraftResponse}
|
||||
| {error, Reason},
|
||||
DraftResponse :: response(),
|
||||
Reason :: any().
|
||||
% @doc
|
||||
% This mostly just validates that all the 't's have been dotted and 'i's have
|
||||
% been crossed.
|
||||
%
|
||||
% given an HTTP request:
|
||||
%
|
||||
% - if it is NOT a valid websocket handshake request, error
|
||||
% - if it IS a valid websocket handshake request, form an initial candidate
|
||||
% response record with the following fields:
|
||||
%
|
||||
% code = 101
|
||||
% slogan = "Switching Protocols"
|
||||
% headers = [{"Sec-WebSocket-Accept", ChallengeResponse},
|
||||
% {"Connection", "Upgrade"},
|
||||
% {"Upgrade", "websocket"}].
|
||||
%
|
||||
% YOU are responsible for dealing with any cookie logic, authentication logic,
|
||||
% validating the Origin field, implementing cross-site-request-forgery, adding
|
||||
% the retarded web date, rendering the response, sending it over the socket,
|
||||
% etc.
|
||||
%
|
||||
% The returned ClientExtensions is the result of joining the
|
||||
% <<"sec-websocket-extensions">> fields with ", "
|
||||
%
|
||||
% quoth section 9.1: https://datatracker.ietf.org/doc/html/rfc6455#section-9.1
|
||||
%
|
||||
% > Note that like other HTTP header fields, this header field MAY be
|
||||
% > split or combined across multiple lines. Ergo, the following are
|
||||
% > equivalent:
|
||||
% >
|
||||
% > Sec-WebSocket-Extensions: foo
|
||||
% > Sec-WebSocket-Extensions: bar; baz=2
|
||||
% >
|
||||
% > is exactly equivalent to
|
||||
% >
|
||||
% > Sec-WebSocket-Extensions: foo, bar; baz=2
|
||||
%
|
||||
% Nobody actually uses extensions, so how you choose to parse this is on you.
|
||||
|
||||
handshake(R = #request{method = get, headers = Hs}) ->
|
||||
%% downcase the headers because have to match on them
|
||||
handshake2(R#request{headers = casefold_headers(Hs)});
|
||||
handshake(_) ->
|
||||
{error, bad_method}.
|
||||
|
||||
|
||||
|
||||
-spec casefold_headers(Headers) -> DowncaseHeaders
|
||||
when Headers :: #{Key := Value},
|
||||
Key :: binary(),
|
||||
Value :: binary(),
|
||||
DowncaseHeaders :: Headers.
|
||||
% @private
|
||||
% casefold all the keys in the header because they're case insensitive
|
||||
|
||||
casefold_headers(Headers) ->
|
||||
Downcase =
|
||||
fun({K, V}) ->
|
||||
NewKey = unicode:characters_to_binary(string:casefold(K)),
|
||||
{NewKey, V}
|
||||
end,
|
||||
maps:from_list(lists:map(Downcase, maps:to_list(Headers))).
|
||||
|
||||
|
||||
|
||||
-spec handshake2(DowncaseReq) -> Result
|
||||
when DowncaseReq :: request(),
|
||||
Result :: {ok, DraftResponse}
|
||||
| {error, Reason},
|
||||
DraftResponse :: response(),
|
||||
Reason :: any().
|
||||
% @private
|
||||
% we may assume (WMA) method=get and headers have all been downcased
|
||||
|
||||
handshake2(#request{headers = DowncaseHeaders}) ->
|
||||
% headers MUST contain fields:
|
||||
% sec-websocket-key: _ % arbitrary
|
||||
% sec-websocket-version: 13 % must be EXACTLY 13
|
||||
% connection: Upgrade % must include the token "Upgrade"
|
||||
% upgrade: websocket % must include the token "websocket"
|
||||
MaybeResponseToken = validate_headers(DowncaseHeaders),
|
||||
case MaybeResponseToken of
|
||||
{ok, ResponseToken} ->
|
||||
DraftResponse =
|
||||
#response{code = 101,
|
||||
slogan = "Switching Protocols",
|
||||
headers = [{"Sec-WebSocket-Accept", ResponseToken},
|
||||
{"Connection", "Upgrade"},
|
||||
{"Upgrade", "websocket"}]},
|
||||
{ok, DraftResponse};
|
||||
Error ->
|
||||
Error
|
||||
end.
|
||||
|
||||
|
||||
|
||||
-spec validate_headers(HeadersMap) -> Result
|
||||
when HeadersMap :: #{Key :: binary() := Val :: binary()},
|
||||
Result :: {ok, ResponseToken}
|
||||
| {error, Reason},
|
||||
ResponseToken :: binary(),
|
||||
Reason :: any().
|
||||
% @private
|
||||
% validate:
|
||||
% Upgrade: websocket
|
||||
% Connection: Upgrade
|
||||
% Sec-WebSocket-Version: 13
|
||||
|
||||
validate_headers(#{<<"sec-websocket-key">> := ChallengeToken,
|
||||
<<"sec-websocket-version">> := WS_Vsn,
|
||||
<<"connection">> := Connection,
|
||||
<<"upgrade">> := Upgrade}) ->
|
||||
BadUpgrade = bad_upgrade(Upgrade),
|
||||
BadConnection = bad_connection(Connection),
|
||||
BadVersion = bad_version(WS_Vsn),
|
||||
if
|
||||
BadUpgrade -> {error, {bad_upgrade, Upgrade}};
|
||||
BadConnection -> {error, {bad_connection, Connection}};
|
||||
BadVersion -> {error, {bad_version, WS_Vsn}};
|
||||
true -> {ok, response_token(ChallengeToken)}
|
||||
end;
|
||||
validate_headers(_) ->
|
||||
{error, bad_request}.
|
||||
|
||||
|
||||
|
||||
-spec bad_upgrade(binary()) -> true | false.
|
||||
% @private string must include "websocket" as a token
|
||||
|
||||
bad_upgrade(Str) ->
|
||||
case string:find(Str, "websocket") of
|
||||
nomatch -> true;
|
||||
_ -> false
|
||||
end.
|
||||
|
||||
|
||||
|
||||
-spec bad_connection(binary()) -> true | false.
|
||||
% @private string must include "Upgrade" as a token
|
||||
|
||||
bad_connection(Str) ->
|
||||
case string:find(Str, "Upgrade") of
|
||||
nomatch -> true;
|
||||
_ -> false
|
||||
end.
|
||||
|
||||
|
||||
|
||||
-spec bad_version(binary()) -> true | false.
|
||||
% @private version must be EXACTLY <<"13">>
|
||||
|
||||
bad_version(<<"13">>) -> false;
|
||||
bad_version(_) -> true.
|
||||
|
||||
|
||||
|
||||
-spec response_token(binary()) -> binary().
|
||||
% @doc
|
||||
% Quoth the RFC:
|
||||
%
|
||||
% > Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==
|
||||
% >
|
||||
% > For this header field, the server has to take the value (as present
|
||||
% > in the header field, e.g., the base64-encoded [RFC4648] version minus
|
||||
% > any leading and trailing whitespace) and concatenate this with the
|
||||
% > Globally Unique Identifier (GUID, [RFC4122]) "258EAFA5-E914-47DA-
|
||||
% > 95CA-C5AB0DC85B11" in string form, which is unlikely to be used by
|
||||
% > network endpoints that do not understand the WebSocket Protocol. A
|
||||
% > SHA-1 hash (160 bits) [FIPS.180-3], base64-encoded (see Section 4 of
|
||||
% > [RFC4648]), of this concatenation is then returned in the server's
|
||||
% > handshake.
|
||||
% >
|
||||
% > Concretely, if as in the example above, the |Sec-WebSocket-Key|
|
||||
% > header field had the value "dGhlIHNhbXBsZSBub25jZQ==", the server
|
||||
% > would concatenate the string "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"
|
||||
% > to form the string "dGhlIHNhbXBsZSBub25jZQ==258EAFA5-E914-47DA-95CA-
|
||||
% > C5AB0DC85B11". The server would then take the SHA-1 hash of this,
|
||||
% > giving the value 0xb3 0x7a 0x4f 0x2c 0xc0 0x62 0x4f 0x16 0x90 0xf6
|
||||
% > 0x46 0x06 0xcf 0x38 0x59 0x45 0xb2 0xbe 0xc4 0xea. This value is
|
||||
% > then base64-encoded (see Section 4 of [RFC4648]), to give the value
|
||||
% > "s3pPLMBiTxaQ9kYGzzhZRbK+xOo=". This value would then be echoed in
|
||||
% > the |Sec-WebSocket-Accept| header field.
|
||||
|
||||
response_token(ChallengeToken) when is_binary(ChallengeToken) ->
|
||||
MagicString = <<"258EAFA5-E914-47DA-95CA-C5AB0DC85B11">>,
|
||||
ConcatString = <<ChallengeToken/binary, MagicString/binary>>,
|
||||
Sha1 = crypto:hash(sha, ConcatString),
|
||||
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(),
|
||||
Received :: binary(),
|
||||
TimeoutMS :: non_neg_integer(),
|
||||
Result :: {ok, Message, Frames, Remainder}
|
||||
| {error, Reason},
|
||||
Message :: ws_msg(),
|
||||
Frames :: [frame()],
|
||||
Remainder :: binary(),
|
||||
Reason :: any().
|
||||
% @doc
|
||||
% Equivalent to recv(Socket, Received, [])
|
||||
|
||||
recv(Sock, Recv, TimeoutMS) ->
|
||||
recv(Sock, Recv, TimeoutMS, []).
|
||||
|
||||
|
||||
|
||||
-spec recv(Socket, Received, TimeoutMS, Frames) -> Result
|
||||
when Socket :: gen_tcp:socket(),
|
||||
Received :: binary(),
|
||||
TimeoutMS :: non_neg_integer(),
|
||||
Frames :: [frame()],
|
||||
Result :: {ok, Message, NewFrames, Remainder}
|
||||
| {error, Reason},
|
||||
Message :: ws_msg(),
|
||||
NewFrames :: Frames,
|
||||
Remainder :: binary(),
|
||||
Reason :: any().
|
||||
% @doc
|
||||
% Pull a message off the socket
|
||||
|
||||
recv(Sock, Received, Timeout, Frames) ->
|
||||
case maybe_pop_msg(Frames) of
|
||||
{ok, Message, NewFrames} ->
|
||||
{ok, Message, NewFrames, Received};
|
||||
incomplete ->
|
||||
case recv_frame(#frame{}, Sock, Received, Timeout) of
|
||||
{ok, Frame, NewReceived} ->
|
||||
NewFrames = [Frame | Frames],
|
||||
recv(Sock, NewReceived, Timeout, NewFrames);
|
||||
Error ->
|
||||
Error
|
||||
end;
|
||||
Error ->
|
||||
Error
|
||||
end.
|
||||
|
||||
|
||||
-spec maybe_pop_msg(Frames) -> Result
|
||||
when Frames :: [frame()],
|
||||
Result :: {ok, Message, NewFrames}
|
||||
| incomplete
|
||||
| {error, Reason},
|
||||
Message :: ws_msg(),
|
||||
NewFrames :: Frames,
|
||||
Reason :: any().
|
||||
% @private
|
||||
% try to parse the stack of frames into a single message
|
||||
%
|
||||
% ignores RSV bits
|
||||
% @end
|
||||
|
||||
maybe_pop_msg([]) ->
|
||||
incomplete;
|
||||
% case 1: control frames
|
||||
% note that maybe_control_msg checks that the fin bit is true
|
||||
%
|
||||
% meaning if the client sends a malicious control frame with fin=false, that
|
||||
% error will be caught in maybe_control_msg
|
||||
maybe_pop_msg([Frame = #frame{opcode = ControlOpcode} | Frames])
|
||||
when (ControlOpcode =:= close)
|
||||
orelse (ControlOpcode =:= ping)
|
||||
orelse (ControlOpcode =:= pong) ->
|
||||
case maybe_control_msg(Frame) of
|
||||
{ok, Msg} -> {ok, Msg, Frames};
|
||||
Error -> Error
|
||||
end;
|
||||
% case 2: messages
|
||||
% finished message in a single frame, just pull here
|
||||
maybe_pop_msg([Frame = #frame{fin = true,
|
||||
opcode = DataOpcode,
|
||||
mask = Mask,
|
||||
masking_key = Key,
|
||||
payload = Payload}
|
||||
| Rest])
|
||||
when DataOpcode =:= text; DataOpcode =:= binary ->
|
||||
case maybe_unmask(Frame, Mask, Key, Payload) of
|
||||
{ok, Unmasked} ->
|
||||
Message = {DataOpcode, Unmasked},
|
||||
{ok, Message, Rest};
|
||||
Error ->
|
||||
Error
|
||||
end;
|
||||
% end of a long message
|
||||
maybe_pop_msg(Frames = [#frame{fin = true,
|
||||
opcode = continuation} | _]) ->
|
||||
maybe_long_data_msg(Frames);
|
||||
% unfinished message, say we need more
|
||||
maybe_pop_msg([#frame{fin = false,
|
||||
opcode = continuation}
|
||||
| _]) ->
|
||||
incomplete;
|
||||
% wtf... this case should be impossible
|
||||
maybe_pop_msg([Frame | _]) ->
|
||||
{error, {wtf_frame, Frame}}.
|
||||
|
||||
|
||||
|
||||
-spec maybe_long_data_msg(Frames) -> Result
|
||||
when Frames :: [frame()],
|
||||
Result :: {ok, Message, NewFrames}
|
||||
| {error, Reason},
|
||||
Message :: ws_msg(),
|
||||
NewFrames :: Frames,
|
||||
Reason :: any().
|
||||
% @private
|
||||
% assumes:
|
||||
% 1. top of stack is a finished frame
|
||||
% 2. top opcode is continuation
|
||||
% 3. the stack corresponds to a linear sequence of frames all corresponding to
|
||||
% one message, until we get to the leading frame of the message, which must
|
||||
% have opcode text|binary
|
||||
%
|
||||
% the reason we can make this assumption is because anterior in the call
|
||||
% chain is recv/3, which eagerly consumes control messages
|
||||
%
|
||||
% meaning if we encounter a control frame in the middle here, we can assume
|
||||
% there is some sort of bug
|
||||
%
|
||||
% TODO: I am NOT enforcing that the data message consumes the entire stack of
|
||||
% frames. Given that the context here is eager consumption, this might be a
|
||||
% point of enforcement. Need to think about this.
|
||||
% @end
|
||||
|
||||
maybe_long_data_msg(Frames) ->
|
||||
mldm(Frames, Frames, <<>>).
|
||||
|
||||
|
||||
% general case: decode the payload in this frame
|
||||
mldm(OrigFrames, [Frame | Rest], Acc) ->
|
||||
Opcode = Frame#frame.opcode,
|
||||
Mask = Frame#frame.mask,
|
||||
Key = Frame#frame.masking_key,
|
||||
Payload = Frame#frame.payload,
|
||||
case maybe_unmask(Frame, Mask, Key, Payload) of
|
||||
{ok, Unmasked} ->
|
||||
NewAcc = <<Unmasked/binary, Acc/binary>>,
|
||||
case Opcode of
|
||||
continuation -> mldm(OrigFrames, Rest, NewAcc);
|
||||
text -> {ok, {text, NewAcc}, Rest};
|
||||
binary -> {ok, {binary, NewAcc}, Rest};
|
||||
_ -> {error, {illegal_data_frame, Frame, OrigFrames, Acc}}
|
||||
end;
|
||||
Error ->
|
||||
Error
|
||||
end;
|
||||
% out of frames
|
||||
mldm(OrigFrames, [], Acc) ->
|
||||
{error, {no_start_frame, Acc, OrigFrames}}.
|
||||
|
||||
|
||||
|
||||
-spec maybe_control_msg(Frame) -> Result
|
||||
when Frame :: frame(),
|
||||
Result :: {ok, Message}
|
||||
| {error, Reason},
|
||||
Message :: ws_msg(),
|
||||
Reason :: any().
|
||||
% @private
|
||||
% assume the frame is a control frame, validate it, and unmask the payload
|
||||
%
|
||||
% TODO: this doesn't enforce that messages from the client HAVE to be masked,
|
||||
% which strictly speaking is part of the protocol.
|
||||
|
||||
maybe_control_msg(F = #frame{fin = true,
|
||||
opcode = Opcode,
|
||||
mask = Mask,
|
||||
payload_length = Len,
|
||||
masking_key = Key,
|
||||
payload = Payload})
|
||||
when ((Opcode =:= close) orelse (Opcode =:= ping) orelse (Opcode =:= pong))
|
||||
andalso (Len =< 125) ->
|
||||
case maybe_unmask(F, Mask, Key, Payload) of
|
||||
{ok, UnmaskedPayload} ->
|
||||
Msg = {Opcode, UnmaskedPayload},
|
||||
{ok, Msg};
|
||||
Error ->
|
||||
Error
|
||||
end;
|
||||
maybe_control_msg(F) ->
|
||||
{error, {illegal_frame, F}}.
|
||||
|
||||
|
||||
|
||||
-spec maybe_unmask(Frame, Mask, Key, Payload) -> Result
|
||||
when Frame :: frame(),
|
||||
Mask :: boolean(),
|
||||
Key :: <<>> | <<_:32>>,
|
||||
Payload :: binary(),
|
||||
Result :: {ok, Unmasked}
|
||||
| {error, Reason},
|
||||
Unmasked :: binary(),
|
||||
Reason :: any().
|
||||
% @private
|
||||
% unmask the payload
|
||||
% @end
|
||||
|
||||
% eliminate invalid pairs of {mask, masking_key}
|
||||
maybe_unmask(_, true, <<Key:4/bytes>>, Payload) -> {ok, mask_unmask(Key, Payload)};
|
||||
maybe_unmask(_, false, <<>>, Payload) -> {ok, Payload};
|
||||
maybe_unmask(F, true, <<>>, _) -> {error, {illegal_frame, F}};
|
||||
maybe_unmask(F, false, <<_:4/bytes>>, _) -> {error, {illegal_frame, F}}.
|
||||
|
||||
|
||||
%% invertible
|
||||
%% see: https://datatracker.ietf.org/doc/html/rfc6455#section-5.3
|
||||
mask_unmask(Key = <<_:4/bytes>>, Payload) ->
|
||||
mu(Key, Key, Payload, <<>>).
|
||||
|
||||
% essentially this is a modular zipWith xor of the masking key with the payload
|
||||
mu(Key, <<KeyByte:8, KeyRest/binary>>, <<PayloadByte:8, PayloadRest/binary>>, Acc) ->
|
||||
NewByte = KeyByte bxor PayloadByte,
|
||||
NewAcc = <<Acc/binary, NewByte:8>>,
|
||||
mu(Key, KeyRest, PayloadRest, NewAcc);
|
||||
% this is the case where we need to refresh the active key
|
||||
mu(Key, <<>>, Payload, Acc) ->
|
||||
mu(Key, Key, Payload, Acc);
|
||||
% done
|
||||
mu(_, _, <<>>, Acc) ->
|
||||
Acc.
|
||||
|
||||
|
||||
|
||||
-spec recv_frame(Parsed, Socket, Received, TimeoutMS) -> Result
|
||||
when Parsed :: frame(),
|
||||
Socket :: gen_tcp:socket(),
|
||||
Received :: bitstring(),
|
||||
TimeoutMS :: non_neg_integer(),
|
||||
Result :: {ok, frame(), Remainder}
|
||||
| {error, Reason},
|
||||
Remainder :: bitstring(),
|
||||
Reason :: any().
|
||||
% @private
|
||||
% parse a single frame off the socket
|
||||
% @end
|
||||
|
||||
%% frame: 1 bit
|
||||
recv_frame(Frame = #frame{fin = none}, Sock, <<FinBit:1, Rest/bits>>, Timeout) ->
|
||||
NewFin =
|
||||
case FinBit of
|
||||
0 -> false;
|
||||
1 -> true
|
||||
end,
|
||||
NewFrame = Frame#frame{fin = NewFin},
|
||||
recv_frame(NewFrame, Sock, Rest, Timeout);
|
||||
recv_frame(Frame = #frame{fin = none}, Sock, Received = <<>>, Timeout) ->
|
||||
recv_frame_await(Frame, Sock, Received, Timeout);
|
||||
%% rsv: 3 bits
|
||||
recv_frame(Frame = #frame{rsv = none}, Sock, <<RSV:3/bits, Rest/bits>>, Timeout) ->
|
||||
NewFrame = Frame#frame{rsv = RSV},
|
||||
recv_frame(NewFrame, Sock, Rest, Timeout);
|
||||
recv_frame(Frame = #frame{rsv = none}, Sock, Received, Timeout) ->
|
||||
recv_frame_await(Frame, Sock, Received, Timeout);
|
||||
%% opcode: 4 bits
|
||||
recv_frame(Frame = #frame{opcode = none}, Sock, <<OpcodeInt:4, Rest/bits>>, Timeout) ->
|
||||
Opcode =
|
||||
case OpcodeInt of
|
||||
0 -> continuation;
|
||||
1 -> text;
|
||||
2 -> binary;
|
||||
8 -> close;
|
||||
9 -> ping;
|
||||
10 -> pong;
|
||||
_ -> bad_opcode
|
||||
end,
|
||||
case Opcode of
|
||||
bad_opcode ->
|
||||
{error, {bad_opcode, OpcodeInt}};
|
||||
_ ->
|
||||
NewFrame = Frame#frame{opcode = Opcode},
|
||||
recv_frame(NewFrame, Sock, Rest, Timeout)
|
||||
end;
|
||||
recv_frame(Frame = #frame{opcode = none}, Sock, Received, Timeout) ->
|
||||
recv_frame_await(Frame, Sock, Received, Timeout);
|
||||
%% mask: 1 bit
|
||||
recv_frame(Frame = #frame{mask = none}, Sock, <<MaskBit:1, Rest/bits>>, Timeout) ->
|
||||
NewMask =
|
||||
case MaskBit of
|
||||
0 -> false;
|
||||
1 -> true
|
||||
end,
|
||||
NewFrame = Frame#frame{mask = NewMask},
|
||||
recv_frame(NewFrame, Sock, Rest, Timeout);
|
||||
recv_frame(Frame = #frame{mask = none}, Sock, Received = <<>>, Timeout) ->
|
||||
recv_frame_await(Frame, Sock, Received, Timeout);
|
||||
%% payload length: variable (yay)
|
||||
% first case: short length 0..125
|
||||
recv_frame(Frame = #frame{payload_length = none}, Sock, <<Len:7, Rest/bits>>, Timeout) when Len =< 125 ->
|
||||
NewFrame = Frame#frame{payload_length = Len},
|
||||
recv_frame(NewFrame, Sock, Rest, Timeout);
|
||||
% second case: 126 -> 2 bytes to follow
|
||||
recv_frame(Frame = #frame{payload_length = none}, Sock, <<126:7, Len:16, Rest/bits>>, Timeout) ->
|
||||
NewFrame = Frame#frame{payload_length = Len},
|
||||
recv_frame(NewFrame, Sock, Rest, Timeout);
|
||||
% third case: 127 -> 8 bytes to follow
|
||||
% bytes must start with a 0 bit
|
||||
recv_frame(_Frame = #frame{payload_length = none}, _Sock, <<127:7, 1:1, _/bits>>, _Timeout) ->
|
||||
{error, {illegal_frame, "payload length >= 1 bsl 63"}};
|
||||
% 127, next is a legal length, continue
|
||||
recv_frame(Frame = #frame{payload_length = none}, Sock, <<127:7, Len:64, Rest/bits>>, Timeout) ->
|
||||
NewFrame = Frame#frame{payload_length = Len},
|
||||
recv_frame(NewFrame, Sock, Rest, Timeout);
|
||||
% otherwise wait
|
||||
recv_frame(Frame = #frame{payload_length = none}, Sock, Received, Timeout) ->
|
||||
recv_frame_await(Frame, Sock, Received, Timeout);
|
||||
%% masking key: 0 or 4 bits
|
||||
% not expecting a masking key, fill in that field here
|
||||
recv_frame(Frame = #frame{mask = false, masking_key = none}, Sock, Received, Timeout) ->
|
||||
NewFrame = Frame#frame{masking_key = <<>>},
|
||||
recv_frame(NewFrame, Sock, Received, Timeout);
|
||||
% expecting one
|
||||
recv_frame(Frame = #frame{mask = true, masking_key = none}, Sock, <<Key:4/bytes, Rest/bits>>, Timeout) ->
|
||||
NewFrame = Frame#frame{masking_key = Key},
|
||||
recv_frame(NewFrame, Sock, Rest, Timeout);
|
||||
% not found
|
||||
recv_frame(Frame = #frame{mask = true, masking_key = none}, Sock, Received, Timeout) ->
|
||||
recv_frame_await(Frame, Sock, Received, Timeout);
|
||||
%% payload
|
||||
recv_frame(Frame = #frame{payload_length = Len, payload = none}, Sock, Received, Timeout) when is_integer(Len) ->
|
||||
case Received of
|
||||
% we have enough bytes
|
||||
<<Payload:Len/bytes, Rest/bits>> ->
|
||||
FinalFrame = Frame#frame{payload = Payload},
|
||||
{ok, FinalFrame, Rest};
|
||||
% we do not have enough bytes
|
||||
_ ->
|
||||
recv_frame_await(Frame, Sock, Received, Timeout)
|
||||
end.
|
||||
|
||||
|
||||
|
||||
%% 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} ->
|
||||
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 ->
|
||||
{error, timeout}
|
||||
end;
|
||||
{error, Reason} ->
|
||||
{error, {inet, Reason}}
|
||||
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(),
|
||||
Message :: ws_msg(),
|
||||
Result :: ok
|
||||
| {error, Reason},
|
||||
Reason :: any().
|
||||
% @doc
|
||||
% send message to client over Socket. handles frame nonsense
|
||||
%
|
||||
% max payload size is 2^63 - 1 bytes
|
||||
% @end
|
||||
|
||||
send(Socket, {Type, Payload}) ->
|
||||
BPayload = payload_to_binary(Payload),
|
||||
Frame = message_to_frame(Type, BPayload),
|
||||
send_frame(Socket, Frame).
|
||||
|
||||
payload_to_binary(Bin) when is_binary(Bin) -> Bin;
|
||||
payload_to_binary(X) -> unicode:characters_to_binary(X).
|
||||
|
||||
|
||||
% data messages
|
||||
message_to_frame(Data, Payload)
|
||||
when ((Data =:= text) orelse (Data =:= binary)),
|
||||
is_binary(Payload),
|
||||
(byte_size(Payload) =< ?MAX_PAYLOAD_SIZE) ->
|
||||
#frame{fin = true,
|
||||
opcode = Data,
|
||||
payload_length = byte_size(Payload),
|
||||
payload = Payload};
|
||||
message_to_frame(Control, Payload)
|
||||
when ((Control =:= close) orelse (Control =:= ping) orelse (Control =:= pong)),
|
||||
is_binary(Payload),
|
||||
(byte_size(Payload) =< 125) ->
|
||||
#frame{fin = true,
|
||||
opcode = Control,
|
||||
payload_length = byte_size(Payload),
|
||||
payload = Payload}.
|
||||
|
||||
|
||||
|
||||
-spec send_frame(Sock, Frame) -> Result
|
||||
when Sock :: gen_tcp:socket(),
|
||||
Frame :: frame(),
|
||||
Result :: ok
|
||||
| {error, Reason},
|
||||
Reason :: tcp_error().
|
||||
% @private
|
||||
% send a frame on the socket
|
||||
% @end
|
||||
|
||||
send_frame(Sock, Frame) ->
|
||||
Binary = render_frame(Frame),
|
||||
gen_tcp:send(Sock, Binary).
|
||||
|
||||
|
||||
|
||||
-spec render_frame(Frame) -> Binary
|
||||
when Frame :: frame(),
|
||||
Binary :: binary().
|
||||
% @private
|
||||
% render a frame
|
||||
%
|
||||
% All fields in a `#frame{}` record have default values of `none`.
|
||||
%
|
||||
% ```erlang
|
||||
% -record(frame,
|
||||
% {fin = none :: none | boolean(),
|
||||
% rsv = none :: none | <<_:3>>,
|
||||
% opcode = none :: none | opcode(),
|
||||
% mask = none :: none | boolean(),
|
||||
% payload_length = none :: none | non_neg_integer(),
|
||||
% masking_key = none :: none | <<>> | <<_:32>>,
|
||||
% payload = none :: none | binary()}).
|
||||
% ```
|
||||
%
|
||||
% Given a value of `none`, some of these fields are inferred, some cannot be
|
||||
% inferred.
|
||||
%
|
||||
% Inference cases:
|
||||
%
|
||||
% ```
|
||||
% rsv = none -> <<0:3>>
|
||||
% mask = none -> false
|
||||
% masking_key = none -> <<>>
|
||||
% payload_length = none -> byte_size(Payload)
|
||||
% ```
|
||||
%
|
||||
% Non-inference:
|
||||
%
|
||||
% ```
|
||||
% fin
|
||||
% opcode
|
||||
% payload
|
||||
% ```
|
||||
% @end
|
||||
|
||||
render_frame(#frame{fin = Fin,
|
||||
rsv = RSV,
|
||||
opcode = Opcode,
|
||||
mask = Mask,
|
||||
payload_length = Len,
|
||||
masking_key = MaskingKey,
|
||||
payload = Payload}) ->
|
||||
BFin =
|
||||
case Fin of
|
||||
true -> <<1:1>>;
|
||||
false -> <<0:1>>
|
||||
end,
|
||||
BRSV =
|
||||
case RSV of
|
||||
none -> <<0:3>>;
|
||||
<<_:3>> -> RSV;
|
||||
_ -> error({illegal_rsv, RSV})
|
||||
end,
|
||||
BOpcode =
|
||||
case Opcode of
|
||||
continuation -> << 0:4>>;
|
||||
text -> << 1:4>>;
|
||||
binary -> << 2:4>>;
|
||||
close -> << 8:4>>;
|
||||
ping -> << 9:4>>;
|
||||
pong -> <<10:4>>
|
||||
end,
|
||||
BoolMask =
|
||||
case Mask of
|
||||
none -> false;
|
||||
false -> false;
|
||||
true -> true
|
||||
end,
|
||||
BMask =
|
||||
case BoolMask of
|
||||
true -> <<1:1>>;
|
||||
false -> <<0:1>>
|
||||
end,
|
||||
IntPayloadLength =
|
||||
case Len of
|
||||
none -> byte_size(Payload);
|
||||
_ -> Len
|
||||
end,
|
||||
BPayloadLength = render_payload_length(IntPayloadLength),
|
||||
BMaskingKey =
|
||||
case {BoolMask, MaskingKey} of
|
||||
{false, none} -> <<>>;
|
||||
{false, <<>>} -> <<>>;
|
||||
{true, <<BKey:4/bytes>>} -> BKey;
|
||||
{false, _} -> error({not_masking_but_have_masking_key, {Mask, MaskingKey}});
|
||||
{true, _} -> error({illegal_masking_key, MaskingKey})
|
||||
end,
|
||||
% failure case here is same as error case just above, so no need to worry
|
||||
% about cryptic "illegal frame" message
|
||||
%
|
||||
% masking = unmasking, so `maybe_unmask` is a bit of a misnomer
|
||||
{ok, BPayload} = maybe_unmask(#frame{}, BoolMask, BMaskingKey, Payload),
|
||||
<<BFin/bits,
|
||||
BRSV/bits,
|
||||
BOpcode/bits,
|
||||
BMask/bits,
|
||||
BPayloadLength/bits,
|
||||
BMaskingKey/binary,
|
||||
BPayload/binary>>.
|
||||
|
||||
|
||||
-spec render_payload_length(non_neg_integer()) -> binary().
|
||||
% @private
|
||||
% > Payload length: 7 bits, 7+16 bits, or 7+64 bits
|
||||
% >
|
||||
% > The length of the "Payload data", in bytes: if 0-125, that is the
|
||||
% > payload length. If 126, the following 2 bytes interpreted as a
|
||||
% > 16-bit unsigned integer are the payload length. If 127, the
|
||||
% > following 8 bytes interpreted as a 64-bit unsigned integer (the
|
||||
% > most significant bit MUST be 0) are the payload length. Multibyte
|
||||
% > length quantities are expressed in network byte order. Note that
|
||||
% > in all cases, the minimal number of bytes MUST be used to encode
|
||||
% > the length, for example, the length of a 124-byte-long string
|
||||
% > can't be encoded as the sequence 126, 0, 124. The payload length
|
||||
% > is the length of the "Extension data" + the length of the
|
||||
% > "Application data". The length of the "Extension data" may be
|
||||
% > zero, in which case the payload length is the length of the
|
||||
% > "Application data".
|
||||
|
||||
render_payload_length(Len) when 0 =< Len, Len =< 125 ->
|
||||
<<Len:7>>;
|
||||
render_payload_length(Len) when 126 =< Len, Len =< 2#1111_1111_1111_1111 ->
|
||||
<<126:7, Len:16>>;
|
||||
render_payload_length(Len) when (1 bsl 16) =< Len, Len =< ?MAX_PAYLOAD_SIZE ->
|
||||
<<127:7, Len:64>>.
|
||||
@@ -1,6 +1,7 @@
|
||||
% @doc
|
||||
% porcelain wfc ops
|
||||
-module(wfc).
|
||||
-vsn("0.2.0").
|
||||
|
||||
-export_type([
|
||||
sentence/0
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
% @doc
|
||||
% bit matrices
|
||||
-module(wfc_bm).
|
||||
-vsn("0.2.0").
|
||||
|
||||
-export_type([
|
||||
bit/0,
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
-module(wfc_eval).
|
||||
-vsn("0.2.0").
|
||||
|
||||
-export_type([
|
||||
]).
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
-module(wfc_eval_context).
|
||||
-vsn("0.2.0").
|
||||
|
||||
-export_type([
|
||||
context/0
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
%
|
||||
% mathematically, this is a variable like "a", "b", "c", etc
|
||||
-module(wfc_ltr).
|
||||
-vsn("0.2.0").
|
||||
|
||||
-export_type([
|
||||
ltr/0
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
-module(wfc_pp).
|
||||
-vsn("0.2.0").
|
||||
|
||||
-export([
|
||||
eval_result/1,
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
-module(wfc_read).
|
||||
-vsn("0.2.0").
|
||||
|
||||
-export_type([
|
||||
]).
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
%
|
||||
% empty sentence is 0
|
||||
-module(wfc_sentence).
|
||||
-vsn("0.2.0").
|
||||
|
||||
-export_type([
|
||||
sentence/0
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
% @doc
|
||||
% sentence-fun <-> truth table logic
|
||||
-module(wfc_sftt).
|
||||
-vsn("0.2.0").
|
||||
|
||||
-export_type([
|
||||
sf/0, tt/0
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
% @doc
|
||||
% library of truth tables
|
||||
-module(wfc_ttfuns).
|
||||
-vsn("0.2.0").
|
||||
|
||||
-export_type([
|
||||
bit/0,
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
% @doc misc utility functions
|
||||
-module(wfc_utils).
|
||||
-vsn("0.2.0").
|
||||
|
||||
-export([err/2, str/2, emsg/2]).
|
||||
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
%
|
||||
% operations assume all inputs are valid
|
||||
-module(wfc_word).
|
||||
-vsn("0.2.0").
|
||||
|
||||
-export_type([
|
||||
word/0
|
||||
|
||||
-694
@@ -1,694 +0,0 @@
|
||||
%%% @doc
|
||||
%%% ZJ: The tiny JSON parser
|
||||
%%%
|
||||
%%% This module exports four functions and accepts no options.
|
||||
%%% @end
|
||||
|
||||
-module(zj).
|
||||
-vsn("1.1.2").
|
||||
-author("Craig Everett <zxq9@zxq9.com>").
|
||||
-copyright("Craig Everett <zxq9@zxq9.com>").
|
||||
-license("MIT").
|
||||
|
||||
-export([encode/1, decode/1,
|
||||
binary_encode/1, binary_decode/1]).
|
||||
|
||||
-export_type([value/0, bin_value/0]).
|
||||
|
||||
-type value() :: string()
|
||||
| number()
|
||||
| true
|
||||
| false
|
||||
| undefined
|
||||
| [value()]
|
||||
| #{string() := value()}.
|
||||
|
||||
|
||||
-type bin_value() :: binary()
|
||||
| number()
|
||||
| true
|
||||
| false
|
||||
| undefined
|
||||
| [bin_value()]
|
||||
| #{binary() := bin_value()}.
|
||||
|
||||
|
||||
|
||||
%%% Character constants
|
||||
|
||||
-define(BKSPC, 16#08).
|
||||
-define(H_TAB, 16#09).
|
||||
-define(NEW_L, 16#0A).
|
||||
-define(FORMF, 16#0C).
|
||||
-define(CAR_R, 16#0D).
|
||||
-define(SPACE, 16#20).
|
||||
|
||||
|
||||
%%% Interface Functions
|
||||
|
||||
-spec encode(term()) -> string().
|
||||
|
||||
%% @doc
|
||||
%% Take any convertable Erlang term and convert it to a JSON string.
|
||||
%%
|
||||
%% As JSON can only satirically be referred to as "a serialization format", it is
|
||||
%% almost impossible to map any interesting data between Erlang (or any other language)
|
||||
%% and JSON. For example, tuples do not exist in JSON, so converting an Erlang tuple
|
||||
%% turns it into a list (a JSON array). Atoms also do not exist, so atoms other than
|
||||
%% the ternay logic values `true', `false' and `null' become strings (those three
|
||||
%% remain as atoms, with the added detail that JSON `null' maps to Erlang
|
||||
%% `undefined').
|
||||
%%
|
||||
%% Unless care is taken to pick types that JSON can accurately express (integers,
|
||||
%% floats, strings, maps, lists, ternary logic atoms) it is not possible to guarantee
|
||||
%% (or even reasonable to expect) that `Term == decode(encode(Term))' will be true.
|
||||
%%
|
||||
%% This function crashes when it fails. Things that will cause a crash are trying to
|
||||
%% convert non-UTF-8 binaries to strings, use non-string values as object keys,
|
||||
%% encode an unaligned bitstring, etc.
|
||||
%%
|
||||
%% Note that Erlang terms are converted as type primitives, meaning that compound
|
||||
%% functional structures like GB-trees, dicts, sets, etc. will wind up having their
|
||||
%% underlying structures converted as-is which is almost never what you want. It is
|
||||
%% usually best to reduce compound values down to primitives (lists or maps) before
|
||||
%% running encode.
|
||||
%%
|
||||
%% The only unsupported Erlang pritmitive is bitstrings. Care has NOT been taken to
|
||||
%% ensure separation between actual binary data and binaries that are supposed to be
|
||||
%% interpreted as strings. The same is true of deep list data: it just comes out raw
|
||||
%% unless you flatten or convert it to a utf8 string with the unicode module.
|
||||
%%
|
||||
%% NOTE: If you need a serialization format that is less ambiguous and expresses more
|
||||
%% types consider using BERT (language-independent implementations of Erlang external
|
||||
%% binary format) instead: http://bert-rpc.org
|
||||
|
||||
encode(true) -> "true";
|
||||
encode(false) -> "false";
|
||||
encode(undefined) -> "null";
|
||||
encode([]) -> "[]";
|
||||
encode(T) when is_atom(T) -> quote(atom_to_list(T));
|
||||
encode(T) when is_float(T) -> float_to_list(T);
|
||||
encode(T) when is_integer(T) -> integer_to_list(T);
|
||||
encode(T) when is_pid(T) -> quote(pid_to_list(T));
|
||||
encode(T) when is_port(T) -> quote(port_to_list(T));
|
||||
encode(T) when is_function(T) -> quote(erlang:fun_to_list(T));
|
||||
encode(T) when is_reference(T) -> quote(ref_to_list(T));
|
||||
encode(T) -> unicode:characters_to_list(encode_value(T)).
|
||||
|
||||
|
||||
-spec decode(Stream) -> Result
|
||||
when Stream :: unicode:chardata(),
|
||||
Result :: {ok, value()}
|
||||
| {error, Parsed, Remainder}
|
||||
| {incomplete, Parsed, Remainder},
|
||||
Parsed :: value(),
|
||||
Remainder :: unicode:chardata()
|
||||
| unicode:external_chardata()
|
||||
| binary().
|
||||
%% @doc
|
||||
%% Take any IO data acceptable to the unicode module and return a parsed data structure.
|
||||
%% In the event of a parsing error whatever part of the structure could be successfully
|
||||
%% parsed will be returned along with the remainder of the string. Note that the string
|
||||
%% remainder may have been changed to a different form by unicode:characters_to_list/1.
|
||||
%% If the unicode library itself runs into a problem performing the initial conversion
|
||||
%% its error return (`error' or `incomplete') will be returned directly.
|
||||
|
||||
decode(Stream) ->
|
||||
case unicode:characters_to_list(Stream) of
|
||||
E when is_tuple(E) -> E;
|
||||
[16#FEFF | String] -> parse(seek(String));
|
||||
String -> parse(seek(String))
|
||||
end.
|
||||
|
||||
|
||||
-spec binary_encode(term()) -> binary().
|
||||
%% @doc
|
||||
%% A strict encoding routine that works very similarly to `encode/1' but with a few
|
||||
%% differences:
|
||||
%% ```
|
||||
%% - Lists and Strings are firmly separated:
|
||||
%% ALL lists are lists of discrete values, never strings.
|
||||
%% ALL binaries are always UTF-8 strings.
|
||||
%% An Erlang string or io_list will be encoded as JSON array.
|
||||
%% - This function generates a UTF-8 binary, not a list.
|
||||
%% - The burden is on the user to ensure that io_lists are collapsed to unicode
|
||||
%% binaries via `unicode:characters_to_binary/1' before passing in string values.
|
||||
%% - Erlang strings (lists) are still accepted as map/object keys.
|
||||
%% '''
|
||||
%%
|
||||
%% NOTE:
|
||||
%% Most cases are better served by `encode/1', as most code deals in strings and not
|
||||
%% arrays of integer values.
|
||||
%%
|
||||
%% Using this function requires a little bit more work up front (because ununified
|
||||
%% io_list() data will always be interpreted as a JSON array), but provides a way to
|
||||
%% reliably generate lists or strings in an unambiguous way in the special case where
|
||||
%% your code is generating both strings and lists of integer values that may overlap
|
||||
%% with valid UTF-8 codepoint values.
|
||||
|
||||
binary_encode(true) -> <<"true">>;
|
||||
binary_encode(false) -> <<"false">>;
|
||||
binary_encode(undefined) -> <<"null">>;
|
||||
binary_encode(T) when is_atom(T) -> <<"\"", (atom_to_binary(T, utf8))/binary, "\"">>;
|
||||
binary_encode(T) when is_float(T) -> float_to_binary(T);
|
||||
binary_encode(T) when is_integer(T) -> integer_to_binary(T);
|
||||
binary_encode(T) when is_pid(T) -> <<"\"", (list_to_binary(pid_to_list(T)))/binary, "\"">>;
|
||||
binary_encode(T) when is_port(T) -> <<"\"", (list_to_binary(port_to_list(T)))/binary, "\"">>;
|
||||
binary_encode(T) when is_function(T) -> <<"\"", (list_to_binary(erlang:fun_to_list(T)))/binary, "\"">>;
|
||||
binary_encode(T) when is_reference(T) -> <<"\"", (list_to_binary(ref_to_list(T)))/binary, "\"">>;
|
||||
binary_encode(T) -> unicode:characters_to_binary(b_encode_value(T)).
|
||||
|
||||
|
||||
-spec binary_decode(Stream) -> Result
|
||||
when Stream :: unicode:chardata(),
|
||||
Result :: {ok, bin_value()}
|
||||
| {error, Parsed, Remainder}
|
||||
| {incomplete, Parsed, Remainder},
|
||||
Parsed :: bin_value(),
|
||||
Remainder :: binary().
|
||||
%% @doc
|
||||
%% Almost identical in behavior to `decode/1' except this returns strings as binaries
|
||||
%% and arrays of integers as Erlang lists (which may also be valid strings if the
|
||||
%% values are valid UTF-8 codepoints).
|
||||
%%
|
||||
%% NOTE:
|
||||
%% This function returns map keys as binaries
|
||||
|
||||
binary_decode(Stream) ->
|
||||
case b_decode(Stream) of
|
||||
{error, Part, Rest} -> {error, Part, unicode:characters_to_binary(Rest)};
|
||||
Result -> Result
|
||||
end.
|
||||
|
||||
|
||||
|
||||
%%% Encoding Functions
|
||||
|
||||
encode_value(true) -> "true";
|
||||
encode_value(false) -> "false";
|
||||
encode_value(undefined) -> "null";
|
||||
encode_value(T) when is_atom(T) -> quote(atom_to_list(T));
|
||||
encode_value(T) when is_float(T) -> float_to_list(T);
|
||||
encode_value(T) when is_integer(T) -> integer_to_list(T);
|
||||
encode_value(T) when is_binary(T) -> maybe_string(T);
|
||||
encode_value(T) when is_list(T) -> maybe_array(T);
|
||||
encode_value(T) when is_map(T) -> pack_object(T);
|
||||
encode_value(T) when is_tuple(T) -> pack_array(tuple_to_list(T));
|
||||
encode_value(T) when is_pid(T) -> quote(pid_to_list(T));
|
||||
encode_value(T) when is_port(T) -> quote(port_to_list(T));
|
||||
encode_value(T) when is_function(T) -> quote(erlang:fun_to_list(T));
|
||||
encode_value(T) when is_reference(T) -> quote(ref_to_list(T)).
|
||||
|
||||
|
||||
maybe_string(T) ->
|
||||
L = binary_to_list(T),
|
||||
true = io_lib:printable_unicode_list(L),
|
||||
quote(L).
|
||||
|
||||
|
||||
maybe_array(T) ->
|
||||
case io_lib:printable_unicode_list(T) of
|
||||
true -> quote(T);
|
||||
false -> pack_array(T)
|
||||
end.
|
||||
|
||||
|
||||
quote(T) -> [$" | escape(T)].
|
||||
|
||||
escape([]) -> [$"];
|
||||
escape([$\b | T]) -> [$\\, $b | escape(T)];
|
||||
escape([$\f | T]) -> [$\\, $f | escape(T)];
|
||||
escape([$\n | T]) -> [$\\, $n | escape(T)];
|
||||
escape([$\r | T]) -> [$\\, $r | escape(T)];
|
||||
escape([$\t | T]) -> [$\\, $t | escape(T)];
|
||||
escape([$\" | T]) -> [$\\, $" | escape(T)];
|
||||
escape([$\\ | T]) -> [$\\, $\\ | escape(T)];
|
||||
escape([H | T]) -> [H | escape(T)].
|
||||
|
||||
|
||||
pack_array([]) -> "[]";
|
||||
pack_array([H | []]) -> [$[, encode_value(H), $]];
|
||||
pack_array([H | T]) -> [$[, encode_value(H), $,, encode_array(T), $]].
|
||||
|
||||
encode_array([H | []]) -> encode_value(H);
|
||||
encode_array([H | T]) -> [encode_value(H), $,, encode_array(T)].
|
||||
|
||||
|
||||
pack_object(M) ->
|
||||
case maps:to_list(M) of
|
||||
[] ->
|
||||
"{}";
|
||||
[{K, V} | T] when is_list(K) ->
|
||||
true = io_lib:printable_unicode_list(K),
|
||||
Init = [$", K, $", $:, encode_value(V)],
|
||||
[${, lists:foldl(fun pack_object/2, Init, T), $}];
|
||||
[{K, V} | T] when is_binary(K) ->
|
||||
Key = unicode:characters_to_list(K),
|
||||
true = io_lib:printable_unicode_list(Key),
|
||||
Init = [$", Key, $", $:, encode_value(V)],
|
||||
[${, lists:foldl(fun pack_object/2, Init, T), $}];
|
||||
[{K, V} | T] when is_float(K) ->
|
||||
Key = float_to_list(K),
|
||||
Init = [$", Key, $", $:, encode_value(V)],
|
||||
[${, lists:foldl(fun pack_object/2, Init, T), $}];
|
||||
[{K, V} | T] when is_integer(K) ->
|
||||
Key = integer_to_list(K),
|
||||
Init = [$", Key, $", $:, encode_value(V)],
|
||||
[${, lists:foldl(fun pack_object/2, Init, T), $}];
|
||||
[{K, V} | T] when is_atom(K) ->
|
||||
Init = [$", atom_to_list(K), $", $:, encode_value(V)],
|
||||
[${, lists:foldl(fun pack_object/2, Init, T), $}]
|
||||
end.
|
||||
|
||||
pack_object({K, V}, L) when is_list(K) ->
|
||||
true = io_lib:printable_unicode_list(K),
|
||||
[$", K, $", $:, encode_value(V), $, | L];
|
||||
pack_object({K, V}, L) when is_binary(K) ->
|
||||
Key = unicode:characters_to_list(K),
|
||||
true = io_lib:printable_unicode_list(Key),
|
||||
[$", Key, $", $:, encode_value(V), $, | L];
|
||||
pack_object({K, V}, L) when is_float(K) ->
|
||||
Key = float_to_list(K),
|
||||
[$", Key, $", $:, encode_value(V), $, | L];
|
||||
pack_object({K, V}, L) when is_integer(K) ->
|
||||
Key = integer_to_list(K),
|
||||
[$", Key, $", $:, encode_value(V), $, | L];
|
||||
pack_object({K, V}, L) when is_atom(K) ->
|
||||
[$", atom_to_list(K), $", $:, encode_value(V), $, | L].
|
||||
|
||||
|
||||
b_encode_value(true) -> <<"true">>;
|
||||
b_encode_value(false) -> <<"false">>;
|
||||
b_encode_value(undefined) -> <<"null">>;
|
||||
b_encode_value(T) when is_atom(T) -> [$", atom_to_binary(T, utf8), $"];
|
||||
b_encode_value(T) when is_float(T) -> float_to_binary(T);
|
||||
b_encode_value(T) when is_integer(T) -> integer_to_binary(T);
|
||||
b_encode_value(T) when is_binary(T) -> [$", b_maybe_string(T), $"];
|
||||
b_encode_value(T) when is_list(T) -> b_pack_array(T);
|
||||
b_encode_value(T) when is_map(T) -> b_pack_object(T);
|
||||
b_encode_value(T) when is_tuple(T) -> b_pack_array(tuple_to_list(T));
|
||||
b_encode_value(T) when is_pid(T) -> [$", list_to_binary(pid_to_list(T)), $"];
|
||||
b_encode_value(T) when is_port(T) -> [$", list_to_binary(port_to_list(T)), $"];
|
||||
b_encode_value(T) when is_function(T) -> [$", list_to_binary(erlang:fun_to_list(T)), $"];
|
||||
b_encode_value(T) when is_reference(T) -> [$", list_to_binary(ref_to_list(T)), $"].
|
||||
|
||||
|
||||
b_maybe_string(T) ->
|
||||
S = unicode:characters_to_binary(T),
|
||||
true = is_binary(S),
|
||||
S.
|
||||
|
||||
|
||||
b_pack_array([]) -> "[]";
|
||||
b_pack_array([H | []]) -> [$[, b_encode_value(H), $]];
|
||||
b_pack_array([H | T]) -> [$[, b_encode_value(H), $,, b_encode_array(T), $]].
|
||||
|
||||
b_encode_array([H | []]) -> b_encode_value(H);
|
||||
b_encode_array([H | T]) -> [b_encode_value(H), $,, b_encode_array(T)].
|
||||
|
||||
|
||||
b_pack_object(M) ->
|
||||
case maps:to_list(M) of
|
||||
[] ->
|
||||
"{}";
|
||||
[{K, V} | T] when is_list(K) ->
|
||||
true = io_lib:printable_unicode_list(K),
|
||||
Init = [$", K, $", $:, b_encode_value(V)],
|
||||
[${, lists:foldl(fun b_pack_object/2, Init, T), $}];
|
||||
[{K, V} | T] when is_binary(K) ->
|
||||
true = io_lib:printable_unicode_list(unicode:characters_to_list(K)),
|
||||
Init = [$", K, $", $:, b_encode_value(V)],
|
||||
[${, lists:foldl(fun b_pack_object/2, Init, T), $}];
|
||||
[{K, V} | T] when is_float(K) ->
|
||||
Key = float_to_list(K),
|
||||
Init = [$", Key, $", $:, b_encode_value(V)],
|
||||
[${, lists:foldl(fun b_pack_object/2, Init, T), $}];
|
||||
[{K, V} | T] when is_integer(K) ->
|
||||
Key = integer_to_list(K),
|
||||
Init = [$", Key, $", $:, b_encode_value(V)],
|
||||
[${, lists:foldl(fun b_pack_object/2, Init, T), $}];
|
||||
[{K, V} | T] when is_atom(K) ->
|
||||
Init = [$", atom_to_binary(K, utf8), $", $:, b_encode_value(V)],
|
||||
[${, lists:foldl(fun b_pack_object/2, Init, T), $}]
|
||||
end.
|
||||
|
||||
b_pack_object({K, V}, L) when is_list(K) ->
|
||||
true = io_lib:printable_unicode_list(K),
|
||||
[$", K, $", $:, b_encode_value(V), $, | L];
|
||||
b_pack_object({K, V}, L) when is_binary(K) ->
|
||||
true = io_lib:printable_unicode_list(unicode:characters_to_list(K)),
|
||||
[$", K, $", $:, b_encode_value(V), $, | L];
|
||||
b_pack_object({K, V}, L) when is_float(K) ->
|
||||
Key = float_to_list(K),
|
||||
[$", Key, $", $:, b_encode_value(V), $, | L];
|
||||
b_pack_object({K, V}, L) when is_integer(K) ->
|
||||
Key = integer_to_list(K),
|
||||
[$", Key, $", $:, b_encode_value(V), $, | L];
|
||||
b_pack_object({K, V}, L) when is_atom(K) ->
|
||||
[$", atom_to_list(K), $", $:, b_encode_value(V), $, | L].
|
||||
|
||||
|
||||
%%% Decode Functions
|
||||
|
||||
-spec parse(Stream) -> Result
|
||||
when Stream :: string(),
|
||||
Result :: {ok, value()}
|
||||
| {error, Extracted :: value(), Remaining :: string()}.
|
||||
%% @private
|
||||
%% The top-level dispatcher. This packages the top level value (or top-level error)
|
||||
%% for return to the caller. A very similar function (value/1) is used for inner
|
||||
%% values.
|
||||
|
||||
parse([${ | Rest]) ->
|
||||
case object(Rest) of
|
||||
{ok, Object, ""} -> {ok, Object};
|
||||
{ok, Object, More} -> polish(Object, seek(More));
|
||||
Error -> Error
|
||||
end;
|
||||
parse([$[ | Rest]) ->
|
||||
case array(Rest) of
|
||||
{ok, Array, ""} -> {ok, Array};
|
||||
{ok, Array, More} -> polish(Array, seek(More));
|
||||
Error -> Error
|
||||
end;
|
||||
parse([$" | Rest]) ->
|
||||
case string(Rest) of
|
||||
{ok, String, ""} -> {ok, String};
|
||||
{ok, String, More} -> polish(String, seek(More));
|
||||
Error -> Error
|
||||
end;
|
||||
parse([I | Rest]) when I == $-; $0 =< I, I =< $9 ->
|
||||
case number_int(Rest, [I]) of
|
||||
{ok, Number, ""} -> {ok, Number};
|
||||
{ok, Number, More} -> polish(Number, seek(More));
|
||||
Error -> Error
|
||||
end;
|
||||
parse("true" ++ More) ->
|
||||
polish(true, seek(More));
|
||||
parse("false" ++ More) ->
|
||||
polish(false, seek(More));
|
||||
parse("null" ++ More) ->
|
||||
polish(undefined, seek(More));
|
||||
parse(Other) ->
|
||||
{error, [], Other}.
|
||||
|
||||
|
||||
polish(Value, "") -> {ok, Value};
|
||||
polish(Value, More) -> {error, Value, More}.
|
||||
|
||||
|
||||
value([${ | Rest]) -> object(Rest);
|
||||
value([$[ | Rest]) -> array(Rest);
|
||||
value([$" | Rest]) -> string(Rest);
|
||||
value([I | Rest]) when I == $-; $0 =< I, I =< $9 -> number_int(Rest, [I]);
|
||||
value("true" ++ Rest) -> {ok, true, Rest};
|
||||
value("false" ++ Rest) -> {ok, false, Rest};
|
||||
value("null" ++ Rest) -> {ok, undefined, Rest};
|
||||
value(_) -> error.
|
||||
|
||||
|
||||
object([$} | Rest]) -> {ok, #{}, Rest};
|
||||
object(String) -> object(seek(String), #{}).
|
||||
|
||||
object([$} | Rest], Map) ->
|
||||
{ok, Map, Rest};
|
||||
object([$" | Rest], Map) ->
|
||||
case string(Rest) of
|
||||
{ok, Key, Remainder} -> object_value(seek(Remainder), Key, Map);
|
||||
{error, _, _} -> {error, Map, Rest}
|
||||
end;
|
||||
object(Rest, Map) ->
|
||||
{error, Map, Rest}.
|
||||
|
||||
object_value([$: | Rest], Key, Map) ->
|
||||
object_value_parse(seek(Rest), Key, Map);
|
||||
object_value(Rest, Key, Map) ->
|
||||
{error, maps:put(Key, undefined, Map), Rest}.
|
||||
|
||||
object_value_parse(String, Key, Map) ->
|
||||
case value(String) of
|
||||
{ok, Value, Rest} -> object_next(seek(Rest), maps:put(Key, Value, Map));
|
||||
{error, Value, Rest} -> {error, maps:put(Key, Value, Map), Rest};
|
||||
error -> {error, Map, String}
|
||||
end.
|
||||
|
||||
|
||||
object_next([$, | Rest], Map) -> object(seek(Rest), Map);
|
||||
object_next([$} | Rest], Map) -> {ok, Map, seek(Rest)};
|
||||
object_next(Rest, Map) -> {error, Map, Rest}.
|
||||
|
||||
|
||||
array([$] | Rest]) -> {ok, [], Rest};
|
||||
array(String) -> array(seek(String), []).
|
||||
|
||||
array([$] | Rest], List) ->
|
||||
{ok, lists:reverse(List), seek(Rest)};
|
||||
array(String, List) ->
|
||||
case value(String) of
|
||||
{ok, Value, Rest} -> array_next(seek(Rest), [Value | List]);
|
||||
{error, Value, Rest} -> {error, lists:reverse([Value | List]), Rest};
|
||||
error -> {error, lists:reverse(List), String}
|
||||
end.
|
||||
|
||||
array_next([$, | Rest], List) -> array(seek(Rest), List);
|
||||
array_next([$] | Rest], List) -> {ok, lists:reverse(List), seek(Rest)};
|
||||
array_next(Rest, List) -> {error, lists:reverse(List), Rest}.
|
||||
|
||||
|
||||
string(Stream) -> string(Stream, "").
|
||||
|
||||
string([$" | Rest], String) ->
|
||||
{ok, lists:reverse(String), Rest};
|
||||
string([$\\, $" | Rest], String) ->
|
||||
string(Rest, [$" | String]);
|
||||
string([$\\, $\\ | Rest], String) ->
|
||||
string(Rest, [$\\ | String]);
|
||||
string([$\\, $b | Rest], String) ->
|
||||
string(Rest, [?BKSPC | String]);
|
||||
string([$\\, $t | Rest], String) ->
|
||||
string(Rest, [?H_TAB | String]);
|
||||
string([$\\, $n | Rest], String) ->
|
||||
string(Rest, [?NEW_L | String]);
|
||||
string([$\\, $f | Rest], String) ->
|
||||
string(Rest, [?FORMF | String]);
|
||||
string([$\\, $r | Rest], String) ->
|
||||
string(Rest, [?CAR_R | String]);
|
||||
string([$\\, $u, A, B, C, D | Rest], String)
|
||||
when (($0 =< A andalso A =< $9) or ($A =< A andalso A =< $F) or ($a =< A andalso A =< $f))
|
||||
and (($0 =< B andalso B =< $9) or ($A =< B andalso B =< $F) or ($a =< B andalso B =< $f))
|
||||
and (($0 =< C andalso C =< $9) or ($A =< C andalso C =< $F) or ($a =< C andalso C =< $f))
|
||||
and (($0 =< D andalso D =< $9) or ($A =< D andalso D =< $F) or ($a =< D andalso D =< $f)) ->
|
||||
Char = list_to_integer([A, B, C, D], 16),
|
||||
string(Rest, [Char | String]);
|
||||
string(Stream = [$\\, $u | _], String) ->
|
||||
{error, String, Stream};
|
||||
string([$\\, Char | Rest], String)
|
||||
when Char == 16#20;
|
||||
Char == 16#21;
|
||||
16#23 =< Char, Char =< 16#5B;
|
||||
16#5D =< Char, Char =< 16#10FFFF ->
|
||||
string(Rest, [$\\, Char | String]);
|
||||
string([Char | Rest], String)
|
||||
when Char == 16#20;
|
||||
Char == 16#21;
|
||||
16#23 =< Char, Char =< 16#5B;
|
||||
16#5D =< Char, Char =< 16#10FFFF ->
|
||||
string(Rest, [Char | String]);
|
||||
string(Rest, String) ->
|
||||
{error, lists:reverse(String), Rest}.
|
||||
|
||||
|
||||
number_int([$. | Rest], String) ->
|
||||
number_float(Rest, [$. | String]);
|
||||
number_int([$e, Char | Rest], String) when $0 =< Char, Char =< $9 ->
|
||||
number_float_exp(Rest, [Char, $+, $e, $0, $. | String]);
|
||||
number_int([$E, Char | Rest], String) when $0 =< Char, Char =< $9 ->
|
||||
number_float_exp(Rest, [Char, $+, $e, $0, $. | String]);
|
||||
number_int([$e, $+, Char | Rest], String) when $0 =< Char, Char =< $9 ->
|
||||
number_float_exp(Rest, [Char, $+, $e, $0, $. | String]);
|
||||
number_int([$E, $+, Char | Rest], String) when $0 =< Char, Char =< $9 ->
|
||||
number_float_exp(Rest, [Char, $+, $e, $0, $. | String]);
|
||||
number_int([$e, $-, Char | Rest], String) when $0 =< Char, Char =< $9 ->
|
||||
number_float_exp(Rest, [Char, $-, $e, $0, $. | String]);
|
||||
number_int([$E, $-, Char | Rest], String) when $0 =< Char, Char =< $9 ->
|
||||
number_float_exp(Rest, [Char, $-, $e, $0, $. | String]);
|
||||
number_int([Char | Rest], String) when $0 =< Char, Char =< $9 ->
|
||||
number_int(Rest, [Char | String]);
|
||||
number_int(Rest, "-") ->
|
||||
{error, "", [$- | Rest]};
|
||||
number_int(Rest, String) ->
|
||||
{ok, list_to_integer(lists:reverse(String)), seek(Rest)}.
|
||||
|
||||
number_float([Char | Rest], String) when $0 =< Char, Char =< $9 ->
|
||||
number_float(Rest, [Char | String]);
|
||||
number_float([$E, Char | Rest], String) when $0 =< Char, Char =< $9 ->
|
||||
number_float_exp(Rest, [Char, $+, $e | String]);
|
||||
number_float([$e, Char | Rest], String) when $0 =< Char, Char =< $9 ->
|
||||
number_float_exp(Rest, [Char, $+, $e | String]);
|
||||
number_float([$E, $+, Char | Rest], String) when $0 =< Char, Char =< $9 ->
|
||||
number_float_exp(Rest, [Char, $+, $e | String]);
|
||||
number_float([$e, $+, Char | Rest], String) when $0 =< Char, Char =< $9 ->
|
||||
number_float_exp(Rest, [Char, $+, $e | String]);
|
||||
number_float([$E, $-, Char | Rest], String) when $0 =< Char, Char =< $9 ->
|
||||
number_float_exp(Rest, [Char, $-, $e | String]);
|
||||
number_float([$e, $-, Char | Rest], String) when $0 =< Char, Char =< $9 ->
|
||||
number_float_exp(Rest, [Char, $-, $e | String]);
|
||||
number_float(Rest, String) ->
|
||||
Target = lists:reverse(String),
|
||||
try
|
||||
Number = list_to_float(Target),
|
||||
{ok, Number, seek(Rest)}
|
||||
catch
|
||||
error:badarg -> {error, "", Target ++ Rest}
|
||||
end.
|
||||
|
||||
|
||||
number_float_exp([Char | Rest], String) when $0 =< Char, Char =< $9 ->
|
||||
number_float_exp(Rest, [Char | String]);
|
||||
number_float_exp(Rest, String) ->
|
||||
Target = lists:reverse(String),
|
||||
try
|
||||
Number = list_to_float(Target),
|
||||
{ok, Number, seek(Rest)}
|
||||
catch
|
||||
error:badarg -> {error, "", Target ++ Rest}
|
||||
end.
|
||||
|
||||
|
||||
seek([?H_TAB | Rest]) -> seek(Rest);
|
||||
seek([?NEW_L | Rest]) -> seek(Rest);
|
||||
seek([?CAR_R | Rest]) -> seek(Rest);
|
||||
seek([?SPACE | Rest]) -> seek(Rest);
|
||||
seek(String) -> String.
|
||||
|
||||
|
||||
b_decode(Stream) ->
|
||||
case unicode:characters_to_list(Stream) of
|
||||
E when is_tuple(E) -> E;
|
||||
[16#FEFF | String] -> binary_parse(seek(String));
|
||||
String -> binary_parse(seek(String))
|
||||
end.
|
||||
|
||||
-spec binary_parse(Stream) -> Result
|
||||
when Stream :: string(),
|
||||
Result :: {ok, bin_value()}
|
||||
| {error, Extracted :: bin_value(), Remaining :: binary()}.
|
||||
%% @private
|
||||
%% The top-level dispatcher. This packages the top level value (or top-level error)
|
||||
%% for return to the caller. A very similar function (b_value/1) is used for inner
|
||||
%% values.
|
||||
|
||||
binary_parse([${ | Rest]) ->
|
||||
case b_object(Rest) of
|
||||
{ok, Object, ""} -> {ok, Object};
|
||||
{ok, Object, More} -> b_polish(Object, seek(More));
|
||||
Error -> Error
|
||||
end;
|
||||
binary_parse([$[ | Rest]) ->
|
||||
case b_array(Rest) of
|
||||
{ok, Array, ""} -> {ok, Array};
|
||||
{ok, Array, More} -> b_polish(Array, seek(More));
|
||||
Error -> Error
|
||||
end;
|
||||
binary_parse([$" | Rest]) ->
|
||||
case string(Rest) of
|
||||
{ok, String, ""} ->
|
||||
case unicode:characters_to_binary(String) of
|
||||
E when is_tuple(E) -> E;
|
||||
Result -> {ok, Result}
|
||||
end;
|
||||
{ok, String, More} ->
|
||||
case unicode:characters_to_binary(String) of
|
||||
E when is_tuple(E) -> E;
|
||||
Result -> b_polish(Result, seek(More))
|
||||
end;
|
||||
Error ->
|
||||
Error
|
||||
end;
|
||||
binary_parse([I | Rest]) when I == $-; $0 =< I, I =< $9 ->
|
||||
case number_int(Rest, [I]) of
|
||||
{ok, Number, ""} -> {ok, Number};
|
||||
{ok, Number, More} -> b_polish(Number, seek(More));
|
||||
Error -> Error
|
||||
end;
|
||||
binary_parse("true" ++ More) ->
|
||||
b_polish(true, seek(More));
|
||||
binary_parse("false" ++ More) ->
|
||||
b_polish(false, seek(More));
|
||||
binary_parse("null" ++ More) ->
|
||||
b_polish(undefined, seek(More));
|
||||
binary_parse(Other) ->
|
||||
{error, [], Other}.
|
||||
|
||||
|
||||
b_polish(Value, "") -> {ok, Value};
|
||||
b_polish(Value, More) -> {error, Value, More}.
|
||||
|
||||
|
||||
b_value([${ | Rest]) -> b_object(Rest);
|
||||
b_value([$[ | Rest]) -> b_array(Rest);
|
||||
b_value([$" | Rest]) -> b_string(Rest);
|
||||
b_value([I | Rest]) when I == $-; $0 =< I, I =< $9 -> number_int(Rest, [I]);
|
||||
b_value("true" ++ Rest) -> {ok, true, Rest};
|
||||
b_value("false" ++ Rest) -> {ok, false, Rest};
|
||||
b_value("null" ++ Rest) -> {ok, undefined, Rest};
|
||||
b_value(_) -> error.
|
||||
|
||||
|
||||
b_string(Stream) ->
|
||||
case string(Stream) of
|
||||
{ok, String, More} ->
|
||||
case unicode:characters_to_binary(String) of
|
||||
E when is_tuple(E) -> E;
|
||||
Result -> {ok, Result, More}
|
||||
end;
|
||||
Error -> Error
|
||||
end.
|
||||
|
||||
|
||||
b_object([$} | Rest]) -> {ok, #{}, Rest};
|
||||
b_object(String) -> b_object(seek(String), #{}).
|
||||
|
||||
b_object([$} | Rest], Map) ->
|
||||
{ok, Map, Rest};
|
||||
b_object([$" | Rest], Map) ->
|
||||
case string(Rest) of
|
||||
{ok, Key, Remainder} ->
|
||||
b_object_value(seek(Remainder), unicode:characters_to_binary(Key), Map);
|
||||
{error, _, _} ->
|
||||
{error, Map, Rest}
|
||||
end;
|
||||
b_object(Rest, Map) ->
|
||||
{error, Map, Rest}.
|
||||
|
||||
b_object_value([$: | Rest], Key, Map) -> b_object_value_parse(seek(Rest), Key, Map);
|
||||
b_object_value(Rest, Key, Map) -> {error, maps:put(Key, undefined, Map), Rest}.
|
||||
|
||||
b_object_value_parse(String, Key, Map) ->
|
||||
case b_value(String) of
|
||||
{ok, Value, Rest} -> b_object_next(seek(Rest), maps:put(Key, Value, Map));
|
||||
{error, Value, Rest} -> {error, maps:put(Key, Value, Map), Rest};
|
||||
error -> {error, Map, String}
|
||||
end.
|
||||
|
||||
|
||||
b_object_next([$, | Rest], Map) -> b_object(seek(Rest), Map);
|
||||
b_object_next([$} | Rest], Map) -> {ok, Map, seek(Rest)};
|
||||
b_object_next(Rest, Map) -> {error, Map, Rest}.
|
||||
|
||||
|
||||
b_array([$] | Rest]) -> {ok, [], Rest};
|
||||
b_array(String) -> b_array(seek(String), []).
|
||||
|
||||
b_array([$] | Rest], List) ->
|
||||
{ok, lists:reverse(List), seek(Rest)};
|
||||
b_array(String, List) ->
|
||||
case b_value(String) of
|
||||
{ok, Value, Rest} -> b_array_next(seek(Rest), [Value | List]);
|
||||
{error, Value, Rest} -> {error, lists:reverse([Value | List]), Rest};
|
||||
error -> {error, lists:reverse(List), String}
|
||||
end.
|
||||
|
||||
b_array_next([$, | Rest], List) -> b_array(seek(Rest), List);
|
||||
b_array_next([$] | Rest], List) -> {ok, lists:reverse(List), seek(Rest)};
|
||||
b_array_next(Rest, List) -> {error, lists:reverse(List), Rest}.
|
||||
@@ -1,11 +1,11 @@
|
||||
{name,"front end web development lab"}.
|
||||
{type,app}.
|
||||
{modules,[]}.
|
||||
{author,"Peter Harpending"}.
|
||||
{prefix,"fd"}.
|
||||
{desc,"Front End Web Dev in Erlang stuff"}.
|
||||
{author,"Peter Harpending"}.
|
||||
{package_id,{"otpr","fewd",{0,1,0}}}.
|
||||
{deps,[]}.
|
||||
{package_id,{"otpr","fewd",{0,2,0}}}.
|
||||
{deps,[{"otpr","zj",{1,1,2}}]}.
|
||||
{key_name,none}.
|
||||
{a_email,"peterharpending@qpq.swiss"}.
|
||||
{c_email,"peterharpending@qpq.swiss"}.
|
||||
|
||||
Reference in New Issue
Block a user