Compare commits
No commits in common. "master" and "0.1.0" have entirely different histories.
7
Makefile
7
Makefile
@ -1,7 +0,0 @@
|
||||
tsc:
|
||||
cd priv/static/js &&\
|
||||
tsc
|
||||
|
||||
watch:
|
||||
cd priv/static/js &&\
|
||||
tsc --watch
|
||||
@ -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,10 +23,3 @@
|
||||
-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().
|
||||
|
||||
@ -25,19 +25,6 @@ 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;
|
||||
135
priv/index.html
Normal file
135
priv/index.html
Normal file
@ -0,0 +1,135 @@
|
||||
<!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>
|
||||
@ -1,106 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Chat with Websockets</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">Chat with websockets</h1>
|
||||
|
||||
<div class="content-body">
|
||||
<input autofocus label="Nick" id="nick"></input>
|
||||
<textarea hidden disabled id="wfc-output"></textarea>
|
||||
<input hidden id="wfc-input"></input>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
let nelt = document.getElementById('nick');
|
||||
let ielt = document.getElementById('wfc-input');
|
||||
let oelt = document.getElementById('wfc-output');
|
||||
let ws = new WebSocket("/ws/chat");
|
||||
let nick = '';
|
||||
|
||||
// when user hits any key while typing in nick
|
||||
function on_nick(evt) {
|
||||
if (evt.key === 'Enter') {
|
||||
// don't do default thing
|
||||
evt.preventDefault();
|
||||
// grab contents
|
||||
let contents = nelt.value;
|
||||
let trimmed = contents.trim();
|
||||
// if contents are nonempty
|
||||
let nonempty_contents = trimmed.length > 0;
|
||||
if (nonempty_contents) {
|
||||
nick = trimmed;
|
||||
let msg_obj = ['nick', nick];
|
||||
let msg_str = JSON.stringify(msg_obj);
|
||||
console.log('message to server:', contents.trim());
|
||||
// query backend for result
|
||||
ws.send(msg_str);
|
||||
|
||||
// delete element from dom
|
||||
nelt.remove();
|
||||
oelt.hidden = false;
|
||||
ielt.hidden = false;
|
||||
ielt.autofocus = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 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) {
|
||||
let msg_obj = ['chat', trimmed];
|
||||
let msg_str = JSON.stringify(msg_obj);
|
||||
console.log('message to server:', contents.trim());
|
||||
// query backend for result
|
||||
ws.send(msg_str);
|
||||
|
||||
// clear input
|
||||
ielt.value = '';
|
||||
|
||||
// add to output
|
||||
oelt.value += '> ';
|
||||
oelt.value += trimmed;
|
||||
oelt.value += '\n';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function main() {
|
||||
nelt.addEventListener('keydown', on_nick);
|
||||
ielt.addEventListener('keydown', on_input_key);
|
||||
ws.onmessage =
|
||||
function (msg_evt) {
|
||||
console.log('message from server:', msg_evt);
|
||||
let msg_str = msg_evt.data;
|
||||
let msg_obj = JSON.parse(msg_str);
|
||||
|
||||
oelt.value += msg_obj.nick;
|
||||
oelt.value += '> ';
|
||||
oelt.value += msg_obj.msg;
|
||||
oelt.value += '\n';
|
||||
};
|
||||
}
|
||||
|
||||
main();
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@ -1,71 +0,0 @@
|
||||
<!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>
|
||||
@ -1,26 +0,0 @@
|
||||
<!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="/chat.html">Chatroom</a></li>
|
||||
<li><a href="/echo.html">Echo</a></li>
|
||||
<li><a href="/tetris.html">Tetris</a></li>
|
||||
<li><a href="/wfc.html">WFC</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
8
priv/static/js/dist/libfewd.d.ts
vendored
8
priv/static/js/dist/libfewd.d.ts
vendored
@ -1,8 +0,0 @@
|
||||
/**
|
||||
* 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;
|
||||
24
priv/static/js/dist/libfewd.js
vendored
24
priv/static/js/dist/libfewd.js
vendored
@ -1,24 +0,0 @@
|
||||
/**
|
||||
* 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
|
||||
1
priv/static/js/dist/libfewd.js.map
vendored
1
priv/static/js/dist/libfewd.js.map
vendored
@ -1 +0,0 @@
|
||||
{"version":3,"file":"libfewd.js","sourceRoot":"","sources":["../ts/libfewd.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACH,WAAW,EACX,qBAAqB,EACxB,CAAC;AAGF,SACA,WAAW,CACN,gBAAmC,EACnC,cAAsC,EACtC,UAAyB;IAG1B,+DAA+D;IAC/D,IAAI,gBAAgB,CAAC,OAAO,EAAE,CAAC;QAC3B,IAAI,aAAa,GAAW,cAAc,CAAC,YAAY,CAAC;QACxD,sCAAsC;QACtC,IAAI,aAAa,GAAG,UAAU;YAC1B,cAAc,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC;;YAE3D,cAAc,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC;IAChE,CAAC;AACL,CAAC;AAGD,SACA,qBAAqB,CAChB,gBAAmC,EACnC,cAAsC;IAGvC,IAAI,gBAAgB,CAAC,OAAO,EAAE,CAAC;QAC3B,mBAAmB;QACnB,cAAc,CAAC,SAAS,GAAG,cAAc,CAAC,YAAY,CAAC;IAC3D,CAAC;AACL,CAAC"}
|
||||
6
priv/static/js/dist/tetris.d.ts
vendored
6
priv/static/js/dist/tetris.d.ts
vendored
@ -1,6 +0,0 @@
|
||||
/**
|
||||
* Tetris
|
||||
*
|
||||
* @module
|
||||
*/
|
||||
export {};
|
||||
30
priv/static/js/dist/tetris.js
vendored
30
priv/static/js/dist/tetris.js
vendored
@ -1,30 +0,0 @@
|
||||
/**
|
||||
* 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
|
||||
1
priv/static/js/dist/tetris.js.map
vendored
1
priv/static/js/dist/tetris.js.map
vendored
@ -1 +0,0 @@
|
||||
{"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"}
|
||||
6
priv/static/js/dist/wfc.d.ts
vendored
6
priv/static/js/dist/wfc.d.ts
vendored
@ -1,6 +0,0 @@
|
||||
/**
|
||||
* Home page ts/js
|
||||
*
|
||||
* @module
|
||||
*/
|
||||
export {};
|
||||
79
priv/static/js/dist/wfc.js
vendored
79
priv/static/js/dist/wfc.js
vendored
@ -1,79 +0,0 @@
|
||||
/**
|
||||
* 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
|
||||
1
priv/static/js/dist/wfc.js.map
vendored
1
priv/static/js/dist/wfc.js.map
vendored
@ -1 +0,0 @@
|
||||
{"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,CAAC;QACtB,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,CAAC;YACX,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;QACnD,CAAC;IACL,CAAC;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,CAAC;QACD,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,CAAC;YACF,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,QAAQ,CAAC,CAAC;YAC5C,MAAM,GAAG,EAAC,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,mBAAmB,EAAC,CAAC;QACrD,CAAC;IACL,CAAC;IACD,OAAO,CAAM,EAAE,CAAC;QACZ,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC;QACjC,MAAM,GAAG,EAAC,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,eAAe,EAAC,CAAC;IACjD,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC"}
|
||||
@ -1,43 +0,0 @@
|
||||
/**
|
||||
* 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;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,49 +0,0 @@
|
||||
/**
|
||||
* 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;
|
||||
}
|
||||
@ -1,132 +0,0 @@
|
||||
/**
|
||||
* 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;
|
||||
}
|
||||
@ -1,16 +0,0 @@
|
||||
{"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}
|
||||
@ -1,24 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Tetris with Websockets</title>
|
||||
<link rel="stylesheet" href="/css/default.css">
|
||||
<link rel="stylesheet" href="/css/tetris.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">Tetris</h1>
|
||||
|
||||
<textarea id="tetris-state"></textarea>
|
||||
</div>
|
||||
|
||||
<script type="module" src="./js/dist/tetris.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
@ -1,30 +0,0 @@
|
||||
<!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>
|
||||
105
src/et_piece.erl
105
src/et_piece.erl
@ -1,105 +0,0 @@
|
||||
-module(et_piece).
|
||||
-vsn("1.0.4").
|
||||
-author("Craig Everett <zxq9@zxq9.com>").
|
||||
-copyright("Craig Everett <zxq9@zxq9.com>").
|
||||
-license("MIT").
|
||||
|
||||
-export([rand/0, new/1, flip/2, points/2, points/1, type/1, sides/1]).
|
||||
|
||||
-export_type([data/0]).
|
||||
|
||||
-record(p,
|
||||
{flip = 1 :: 1..4,
|
||||
type = i :: erltris:type()}).
|
||||
|
||||
-opaque data() :: #p{}.
|
||||
|
||||
rand() ->
|
||||
case rand:uniform(7) of
|
||||
1 -> new(i);
|
||||
2 -> new(o);
|
||||
3 -> new(t);
|
||||
4 -> new(s);
|
||||
5 -> new(z);
|
||||
6 -> new(j);
|
||||
7 -> new(l)
|
||||
end.
|
||||
|
||||
|
||||
new(T) -> #p{type = T}.
|
||||
|
||||
|
||||
flip(r, Piece = #p{flip = 4}) -> Piece#p{flip = 1};
|
||||
flip(r, Piece = #p{flip = F}) -> Piece#p{flip = F + 1};
|
||||
flip(l, Piece = #p{flip = 1}) -> Piece#p{flip = 4};
|
||||
flip(l, Piece = #p{flip = F}) -> Piece#p{flip = F - 1}.
|
||||
|
||||
|
||||
points(Piece, {LX, LY}) ->
|
||||
Offsets = points(Piece),
|
||||
Translate = fun({OX, OY}) -> {LX + OX, LY + OY} end,
|
||||
lists:map(Translate, Offsets).
|
||||
|
||||
|
||||
points(#p{flip = F, type = T}) ->
|
||||
offset(T, F).
|
||||
|
||||
offset(i, 1) -> [{0, 2}, {1, 2}, {2, 2}, {3, 2}];
|
||||
offset(i, 2) -> [{2, 3}, {2, 2}, {2, 1}, {2, 0}];
|
||||
offset(i, 3) -> [{0, 1}, {1, 1}, {2, 1}, {3, 1}];
|
||||
offset(i, 4) -> [{1, 3}, {1, 2}, {1, 1}, {1, 0}];
|
||||
offset(o, _) -> [{1, 1}, {1, 2}, {2, 1}, {2, 2}];
|
||||
offset(t, 1) -> [{0, 1}, {1, 1}, {2, 1}, {1, 2}];
|
||||
offset(t, 2) -> [{1, 2}, {1, 1}, {1, 0}, {2, 1}];
|
||||
offset(t, 3) -> [{0, 1}, {1, 1}, {2, 1}, {1, 0}];
|
||||
offset(t, 4) -> [{1, 2}, {1, 1}, {1, 0}, {0, 1}];
|
||||
offset(s, 1) -> [{0, 1}, {1, 1}, {1, 2}, {2, 2}];
|
||||
offset(s, 2) -> [{1, 2}, {1, 1}, {2, 1}, {2, 0}];
|
||||
offset(s, 3) -> [{0, 0}, {1, 0}, {1, 1}, {2, 1}];
|
||||
offset(s, 4) -> [{0, 2}, {0, 1}, {1, 1}, {1, 0}];
|
||||
offset(z, 1) -> [{0, 2}, {1, 2}, {1, 1}, {2, 1}];
|
||||
offset(z, 2) -> [{1, 0}, {1, 1}, {2, 1}, {2, 2}];
|
||||
offset(z, 3) -> [{0, 1}, {1, 1}, {1, 0}, {2, 0}];
|
||||
offset(z, 4) -> [{0, 0}, {0, 1}, {1, 1}, {1, 2}];
|
||||
offset(j, 1) -> [{0, 2}, {0, 1}, {1, 1}, {2, 1}];
|
||||
offset(j, 2) -> [{1, 0}, {1, 1}, {1, 2}, {2, 2}];
|
||||
offset(j, 3) -> [{0, 1}, {1, 1}, {2, 1}, {2, 0}];
|
||||
offset(j, 4) -> [{0, 0}, {1, 0}, {1, 1}, {1, 2}];
|
||||
offset(l, 1) -> [{0, 1}, {1, 1}, {2, 1}, {2, 2}];
|
||||
offset(l, 2) -> [{1, 2}, {1, 1}, {1, 0}, {2, 0}];
|
||||
offset(l, 3) -> [{0, 0}, {0, 1}, {1, 1}, {2, 1}];
|
||||
offset(l, 4) -> [{0, 2}, {1, 2}, {1, 1}, {1, 0}].
|
||||
|
||||
|
||||
type(#p{type = T}) -> T.
|
||||
|
||||
|
||||
sides(#p{type = T, flip = F}) ->
|
||||
sides(T, F).
|
||||
|
||||
|
||||
sides(i, 1) -> {0, 3, 2};
|
||||
sides(i, 2) -> {2, 2, 3};
|
||||
sides(i, 3) -> {0, 3, 1};
|
||||
sides(i, 4) -> {1, 1, 3};
|
||||
sides(o, _) -> {1, 2, 2};
|
||||
sides(t, 1) -> {0, 2, 2};
|
||||
sides(t, 2) -> {1, 2, 2};
|
||||
sides(t, 3) -> {0, 2, 1};
|
||||
sides(t, 4) -> {0, 1, 2};
|
||||
sides(s, 1) -> {0, 2, 2};
|
||||
sides(s, 2) -> {1, 2, 2};
|
||||
sides(s, 3) -> {0, 2, 1};
|
||||
sides(s, 4) -> {0, 1, 2};
|
||||
sides(z, 1) -> {0 ,2, 2};
|
||||
sides(z, 2) -> {1, 2, 2};
|
||||
sides(z, 3) -> {0 ,2, 1};
|
||||
sides(z, 4) -> {0, 1, 2};
|
||||
sides(j, 1) -> {0, 2, 2};
|
||||
sides(j, 2) -> {1, 2, 2};
|
||||
sides(j, 3) -> {0, 2, 1};
|
||||
sides(j, 4) -> {0, 1, 2};
|
||||
sides(l, 1) -> {0, 2, 2};
|
||||
sides(l, 2) -> {1, 2, 2};
|
||||
sides(l, 3) -> {0, 2, 1};
|
||||
sides(l, 4) -> {0, 1, 2}.
|
||||
@ -1,79 +0,0 @@
|
||||
-module(et_well).
|
||||
-vsn("1.0.4").
|
||||
-author("Craig Everett <zxq9@zxq9.com>").
|
||||
-copyright("Craig Everett <zxq9@zxq9.com>").
|
||||
-license("MIT").
|
||||
|
||||
-export([new/0, new/2,
|
||||
dimensions/1, height/1, width/1,
|
||||
fetch/3, store/4, complete/1, collapse/2]).
|
||||
|
||||
-export_type([playfield/0]).
|
||||
|
||||
|
||||
-opaque playfield() :: tuple().
|
||||
|
||||
|
||||
new() ->
|
||||
new(10, 20).
|
||||
|
||||
|
||||
new(W, H) ->
|
||||
erlang:make_tuple(H, row(W)).
|
||||
|
||||
|
||||
row(W) ->
|
||||
erlang:make_tuple(W, x).
|
||||
|
||||
|
||||
dimensions(Well) ->
|
||||
H = size(Well),
|
||||
W = size(element(1, Well)),
|
||||
{W, H}.
|
||||
|
||||
|
||||
height(Well) ->
|
||||
size(Well).
|
||||
|
||||
|
||||
width(Well) ->
|
||||
size(element(1, Well)).
|
||||
|
||||
|
||||
fetch(Well, X, Y) ->
|
||||
element(X, element(Y, Well)).
|
||||
|
||||
|
||||
store(Well, Value, X, Y) ->
|
||||
setelement(Y, Well, setelement(X, element(Y, Well), Value)).
|
||||
|
||||
|
||||
complete(Well) ->
|
||||
{W, H} = dimensions(Well),
|
||||
complete(H, W, Well, []).
|
||||
|
||||
complete(Y, W, Well, Lines) when Y >= 1 ->
|
||||
case line_complete(W, element(Y, Well)) of
|
||||
true -> complete(Y - 1, W, Well, [Y | Lines]);
|
||||
false -> complete(Y - 1, W, Well, Lines)
|
||||
end;
|
||||
complete(_, _, _, Lines) ->
|
||||
Lines.
|
||||
|
||||
line_complete(X, Line) when X >= 1 ->
|
||||
case element(X, Line) of
|
||||
x -> false;
|
||||
_ -> line_complete(X - 1, Line)
|
||||
end;
|
||||
line_complete(_, _) ->
|
||||
true.
|
||||
|
||||
|
||||
collapse(Well, Lines) ->
|
||||
Blank = row(width(Well)),
|
||||
Crunch =
|
||||
fun(L, {W, Count}) ->
|
||||
Crunched = erlang:insert_element(1, erlang:delete_element(L, W), Blank),
|
||||
{Crunched, Count + 1}
|
||||
end,
|
||||
lists:foldl(Crunch, {Well, 0}, Lines).
|
||||
262
src/fd_chat.erl
262
src/fd_chat.erl
@ -1,262 +0,0 @@
|
||||
% @doc
|
||||
% controller for chat
|
||||
-module(fd_chat).
|
||||
-vsn("0.1.0").
|
||||
-behavior(gen_server).
|
||||
-author("Peter Harpending <peterharpending@qpq.swiss>").
|
||||
-copyright("Peter Harpending <peterharpending@qpq.swiss>").
|
||||
-license("BSD-2-Clause-FreeBSD").
|
||||
|
||||
-export([
|
||||
join/1,
|
||||
relay/1,
|
||||
nick_available/1
|
||||
]).
|
||||
-export([start_link/0]).
|
||||
-export([init/1, handle_call/3, handle_cast/2, handle_info/2,
|
||||
code_change/3, terminate/2]).
|
||||
|
||||
-include("$zx_include/zx_logger.hrl").
|
||||
|
||||
|
||||
-record(o, {pid :: pid(),
|
||||
nick :: string()}).
|
||||
-type orator() :: #o{}.
|
||||
|
||||
-record(s, {orators = [] :: [orator()]}).
|
||||
|
||||
-type state() :: #s{}.
|
||||
|
||||
|
||||
|
||||
%%% Service Interface
|
||||
|
||||
-spec join(Nick) -> Result
|
||||
when Nick :: string(),
|
||||
Result :: ok
|
||||
| {error, Reason :: any()}.
|
||||
|
||||
join(Nick) ->
|
||||
gen_server:call(?MODULE, {join, Nick}).
|
||||
|
||||
|
||||
|
||||
-spec nick_available(Nick) -> Result
|
||||
when Nick :: string(),
|
||||
Result :: boolean().
|
||||
|
||||
nick_available(Nick) ->
|
||||
gen_server:call(?MODULE, {nick_available, Nick}).
|
||||
|
||||
|
||||
|
||||
-spec relay(Message) -> ok
|
||||
when Message :: string().
|
||||
|
||||
relay(Message) ->
|
||||
gen_server:cast(?MODULE, {relay, self(), Message}).
|
||||
|
||||
|
||||
%%% Startup Functions
|
||||
|
||||
|
||||
-spec start_link() -> Result
|
||||
when Result :: {ok, pid()}
|
||||
| {error, Reason :: term()}.
|
||||
%% @private
|
||||
%% This should only ever be called by fd_chat_orators (the service-level supervisor).
|
||||
|
||||
start_link() ->
|
||||
gen_server:start_link({local, ?MODULE}, ?MODULE, none, []).
|
||||
|
||||
|
||||
-spec init(none) -> {ok, state()}.
|
||||
%% @private
|
||||
%% Called by the supervisor process to give the process a chance to perform any
|
||||
%% preparatory work necessary for proper function.
|
||||
|
||||
init(none) ->
|
||||
ok = tell("~p Starting.", [?MODULE]),
|
||||
State = #s{},
|
||||
{ok, State}.
|
||||
|
||||
|
||||
|
||||
%%% gen_server Message Handling Callbacks
|
||||
|
||||
|
||||
-spec handle_call(Message, From, State) -> Result
|
||||
when Message :: term(),
|
||||
From :: {pid(), reference()},
|
||||
State :: state(),
|
||||
Result :: {reply, Response, NewState}
|
||||
| {noreply, State},
|
||||
Response :: term(),
|
||||
NewState :: state().
|
||||
%% @private
|
||||
%% The gen_server:handle_call/3 callback.
|
||||
%% See: http://erlang.org/doc/man/gen_server.html#Module:handle_call-3
|
||||
|
||||
handle_call({join, Nick}, {Pid, _}, State) ->
|
||||
{Reply, NewState} = do_join(Pid, Nick, State),
|
||||
{reply, Reply, NewState};
|
||||
handle_call({nick_available, Nick}, _, State = #s{orators = Orators}) ->
|
||||
Reply = is_nick_available(Nick, Orators),
|
||||
{reply, Reply, State};
|
||||
handle_call(Unexpected, From, State) ->
|
||||
ok = tell("~p Unexpected call from ~tp: ~tp~n", [?MODULE, From, Unexpected]),
|
||||
{noreply, State}.
|
||||
|
||||
|
||||
-spec handle_cast(Message, State) -> {noreply, NewState}
|
||||
when Message :: term(),
|
||||
State :: state(),
|
||||
NewState :: state().
|
||||
%% @private
|
||||
%% The gen_server:handle_cast/2 callback.
|
||||
%% See: http://erlang.org/doc/man/gen_server.html#Module:handle_cast-2
|
||||
|
||||
handle_cast({relay, From, Message}, State = #s{orators = Orators}) ->
|
||||
do_relay(From, Message, Orators),
|
||||
{noreply, State};
|
||||
handle_cast(Unexpected, State) ->
|
||||
ok = tell("~p Unexpected cast: ~tp~n", [?MODULE, Unexpected]),
|
||||
{noreply, State}.
|
||||
|
||||
|
||||
-spec handle_info(Message, State) -> {noreply, NewState}
|
||||
when Message :: term(),
|
||||
State :: state(),
|
||||
NewState :: state().
|
||||
%% @private
|
||||
%% The gen_server:handle_info/2 callback.
|
||||
%% See: http://erlang.org/doc/man/gen_server.html#Module:handle_info-2
|
||||
|
||||
handle_info(Msg = {'DOWN', _Mon, process, _Pid, _Reason}, State) ->
|
||||
NewState = handle_down(Msg, State),
|
||||
{noreply, NewState};
|
||||
handle_info(Unexpected, State) ->
|
||||
ok = tell("~p Unexpected info: ~tp~n", [?MODULE, Unexpected]),
|
||||
{noreply, State}.
|
||||
|
||||
|
||||
|
||||
%%% OTP Service Functions
|
||||
|
||||
-spec code_change(OldVersion, State, Extra) -> Result
|
||||
when OldVersion :: {down, Version} | Version,
|
||||
Version :: term(),
|
||||
State :: state(),
|
||||
Extra :: term(),
|
||||
Result :: {ok, NewState}
|
||||
| {error, Reason :: term()},
|
||||
NewState :: state().
|
||||
%% @private
|
||||
%% The gen_server:code_change/3 callback.
|
||||
%% See: http://erlang.org/doc/man/gen_server.html#Module:code_change-3
|
||||
|
||||
code_change(_, State, _) ->
|
||||
{ok, State}.
|
||||
|
||||
|
||||
-spec terminate(Reason, State) -> no_return()
|
||||
when Reason :: normal
|
||||
| shutdown
|
||||
| {shutdown, term()}
|
||||
| term(),
|
||||
State :: state().
|
||||
%% @private
|
||||
%% The gen_server:terminate/2 callback.
|
||||
%% See: http://erlang.org/doc/man/gen_server.html#Module:terminate-2
|
||||
|
||||
terminate(_, _) ->
|
||||
ok.
|
||||
|
||||
|
||||
%%% internals
|
||||
|
||||
-spec do_join(Pid, Nick, State) -> {Reply, NewState}
|
||||
when Pid :: pid(),
|
||||
Nick :: string(),
|
||||
Reply :: ok | {error, Reason :: any()},
|
||||
NewState :: State.
|
||||
|
||||
do_join(Pid, Nick, State = #s{orators = Orators}) ->
|
||||
case ensure_can_join(Pid, Nick, Orators) of
|
||||
ok -> do_join2(Pid, Nick, State);
|
||||
Error -> {Error, State}
|
||||
end.
|
||||
|
||||
|
||||
do_join2(Pid, Nick, State = #s{orators = Orators}) ->
|
||||
_Monitor = erlang:monitor(process, Pid),
|
||||
NewOrator = #o{pid = Pid, nick = Nick},
|
||||
NewOrators = [NewOrator | Orators],
|
||||
NewState = State#s{orators = NewOrators},
|
||||
{ok, NewState}.
|
||||
|
||||
|
||||
-spec ensure_can_join(Pid, Nick, Orators) -> Result
|
||||
when Pid :: pid(),
|
||||
Nick :: string(),
|
||||
Orators :: [orator()],
|
||||
Result :: ok
|
||||
| {error, Reason},
|
||||
Reason :: any().
|
||||
% @private
|
||||
% ensures both Pid and Nick are unique
|
||||
|
||||
ensure_can_join(Pid, _ , [#o{pid = Pid} | _ ]) -> {error, already_joined};
|
||||
ensure_can_join(_ , Nick, [#o{nick = Nick} | _ ]) -> {error, {nick_taken, Nick}};
|
||||
ensure_can_join(Pid, Nick, [_ | Rest]) -> ensure_can_join(Pid, Nick, Rest);
|
||||
ensure_can_join(_ , _ , [] ) -> ok.
|
||||
|
||||
|
||||
-spec is_nick_available(Nick, Orators) -> boolean()
|
||||
when Nick :: string(),
|
||||
Orators :: [orator()].
|
||||
|
||||
is_nick_available(Nick, [#o{nick = Nick} | _ ]) -> false;
|
||||
is_nick_available(Nick, [_ | Rest]) -> is_nick_available(Nick, Rest);
|
||||
is_nick_available(_ , [] ) -> true.
|
||||
|
||||
|
||||
|
||||
-spec handle_down(Msg, State) -> NewState
|
||||
when Msg :: {'DOWN', Mon, process, Pid, Reason},
|
||||
Mon :: erlang:monitor(),
|
||||
Pid :: pid(),
|
||||
Reason :: any(),
|
||||
State :: state(),
|
||||
NewState :: State.
|
||||
|
||||
handle_down(Msg = {'DOWN', _, process, Pid, _}, State = #s{orators = Orators}) ->
|
||||
NewOrators = hdn(Msg, Pid, Orators, []),
|
||||
NewState = State#s{orators = NewOrators},
|
||||
NewState.
|
||||
|
||||
% encountered item, removing
|
||||
hdn(_, Pid, [#o{pid = Pid} | Rest], Acc) -> Rest ++ Acc;
|
||||
hdn(Msg, Pid, [Skip | Rest], Acc) -> hdn(Msg, Pid, Rest, [Skip | Acc]);
|
||||
hdn(Msg, _, [] , Acc) ->
|
||||
log("~tp: Unexpected message: ~tp", [?MODULE, Msg]),
|
||||
Acc.
|
||||
|
||||
|
||||
do_relay(Pid, Message, Orators) ->
|
||||
case lists:keyfind(Pid, #o.pid, Orators) of
|
||||
#o{nick = Nick} ->
|
||||
do_relay2(Nick, Message, Orators);
|
||||
false ->
|
||||
tell("~tp: Message received from outsider ~tp: ~tp", [?MODULE, Pid, Message]),
|
||||
error
|
||||
end.
|
||||
|
||||
% skip
|
||||
do_relay2(Nick, Msg, [#o{nick = Nick} | Rest]) ->
|
||||
do_relay2(Nick, Msg, Rest);
|
||||
do_relay2(Nick, Msg, [#o{pid = Pid} | Rest]) ->
|
||||
Pid ! {chat, {relay, Nick, Msg}},
|
||||
do_relay2(Nick, Msg, Rest);
|
||||
do_relay2(_, _, []) ->
|
||||
ok.
|
||||
@ -32,7 +32,7 @@
|
||||
|
||||
|
||||
-record(s, {socket = none :: none | gen_tcp:socket(),
|
||||
next = <<>> :: binary()}).
|
||||
next = none :: none | binary()}).
|
||||
|
||||
|
||||
%% An alias for the state record above. Aliasing state can smooth out annoyances
|
||||
@ -128,21 +128,28 @@ listen(Parent, Debug, ListenSocket) ->
|
||||
%% 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}) ->
|
||||
loop(Parent, Debug, State = #s{socket = Socket, next = Next}) ->
|
||||
ok = inet:setopts(Socket, [{active, once}]),
|
||||
receive
|
||||
{tcp, Socket, Message} ->
|
||||
Received = <<Next0/binary, Message/binary>>,
|
||||
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, Next1} ->
|
||||
Next2 = handle_request(Socket, Req, Next1),
|
||||
NewState = State#s{next = Next2},
|
||||
{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
|
||||
tell(error, "~p QHL parse error: ~tp", [?LINE, Error]),
|
||||
tell(error, "~p bad request:~n~ts", [?LINE, Received]),
|
||||
fd_http_utils:http_err(Socket, 400),
|
||||
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;
|
||||
@ -210,190 +217,52 @@ system_replace_state(StateFun, 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).
|
||||
handle_request(Sock, R = #request{method = M, path = P}) when M =/= undefined, P =/= undefined ->
|
||||
tell("~p ~ts", [M, P]),
|
||||
route(Sock, M, P, R).
|
||||
|
||||
|
||||
|
||||
-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) ->
|
||||
route(Sock, get, Route, _Request) ->
|
||||
case Route of
|
||||
<<"/ws/tetris">> -> ws_tetris(Sock, Request, Received);
|
||||
<<"/ws/echo">> -> ws_echo(Sock, Request) , Received;
|
||||
<<"/">> -> route_static(Sock, <<"/index.html">>) , Received;
|
||||
_ -> route_static(Sock, Route) , Received
|
||||
<<"/">> -> home(Sock);
|
||||
<<"/default.css">> -> default_css(Sock);
|
||||
_ -> http_err(Sock, 404)
|
||||
end;
|
||||
route(Sock, post, Route, Request, Received) ->
|
||||
route(Sock, post, Route, Request) ->
|
||||
case Route of
|
||||
<<"/wfcin">> -> wfcin(Sock, Request) , Received;
|
||||
_ -> fd_http_utils:http_err(Sock, 404) , Received
|
||||
<<"/wfcin">> -> wfcin(Sock, Request);
|
||||
_ -> http_err(Sock, 404)
|
||||
end;
|
||||
route(Sock, _, _, _, Received) ->
|
||||
fd_http_utils:http_err(Sock, 404),
|
||||
Received.
|
||||
route(Sock, _, _, _) ->
|
||||
http_err(Sock, 404).
|
||||
|
||||
|
||||
|
||||
-spec route_static(Socket, Route) -> ok
|
||||
when Socket :: gen_tcp:socket(),
|
||||
Route :: binary().
|
||||
|
||||
route_static(Sock, Route) ->
|
||||
respond_static(Sock, fd_sfc:query(Route)).
|
||||
|
||||
|
||||
|
||||
-spec respond_static(Sock, MaybeEty) -> ok
|
||||
when Sock :: gen_tcp:socket(),
|
||||
MaybeEty :: fd_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_sfc_entry:encoding(Entry) of
|
||||
gzip -> [{"content-encoding", "gzip"}];
|
||||
none -> []
|
||||
end,
|
||||
Headers1 = [{"content-type", fd_sfc_entry:mime_type(Entry)} | Headers0],
|
||||
Response = #response{headers = Headers1,
|
||||
body = fd_sfc_entry:contents(Entry)},
|
||||
fd_http_utils:respond(Sock, Response);
|
||||
respond_static(Sock, not_found) ->
|
||||
fd_http_utils:http_err(Sock, 404).
|
||||
|
||||
|
||||
%% ------------------------------
|
||||
%% tetris
|
||||
%% ------------------------------
|
||||
|
||||
-spec ws_tetris(Sock, Request, Received) -> NewReceived
|
||||
when Sock :: gen_tcp:socket(),
|
||||
Request :: request(),
|
||||
Received :: binary(),
|
||||
NewReceived :: binary().
|
||||
|
||||
ws_tetris(Sock, Request, Received) ->
|
||||
.
|
||||
|
||||
|
||||
|
||||
-spec ws_tetris2(Sock, Request, Received) -> NewReceived
|
||||
when Sock :: gen_tcp:socket(),
|
||||
Request :: request(),
|
||||
Received :: binary(),
|
||||
NewReceived :: binary().
|
||||
|
||||
ws_tetris2(Sock, Request, Received) ->
|
||||
%tell("~p: ws_tetris request: ~tp", [?LINE, Request]),
|
||||
case fd_ws:handshake(Request) of
|
||||
{ok, Response} ->
|
||||
fd_http_utils:respond(Sock, Response),
|
||||
{ok, TetrisPid} = fd_tetris:start_link(),
|
||||
ws_tetris_loop(Sock, TetrisPid, [], Received);
|
||||
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("ws_tetris: error: ~tp", [Error]),
|
||||
fd_http_utils:http_err(Sock, 400)
|
||||
tell("error: ~p~n", [self(), Error]),
|
||||
http_err(Sock, 500)
|
||||
end.
|
||||
|
||||
|
||||
-spec ws_tetris_loop(Sock, Tetris, Frames, Received) -> NewReceived
|
||||
when Sock :: gen_tcp:socket(),
|
||||
Tetris :: pid(),
|
||||
Frames :: [fd_ws:frame()],
|
||||
Received :: binary(),
|
||||
NewReceived :: binary().
|
||||
|
||||
ws_tetris_loop(Sock, Tetris, Frames, Received) ->
|
||||
tell("~p:ws_tetris_loop(Sock, ~p, ~p, ~p)", [?MODULE, Tetris, Frames, Received]),
|
||||
%% create tetris state
|
||||
case inet:setopts(Sock, [{active, once}]) of
|
||||
ok ->
|
||||
receive
|
||||
{tcp, Sock, Bin} ->
|
||||
Rcv1 = <<Received/binary, Bin/binary>>,
|
||||
case fd_ws:recv(Sock, Rcv1, 3_000, Frames) of
|
||||
{ok, WsMsg, NewFrames, Rcv2} ->
|
||||
ok = fd_tetris:ws_msg(Tetris, WsMsg),
|
||||
ws_tetris_loop(Sock, Tetris, NewFrames, Rcv2);
|
||||
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 ->
|
||||
error(Error)
|
||||
end;
|
||||
{tetris, Message} ->
|
||||
ok = log(info, "~p tetris: ~p", [self(), Message]),
|
||||
ok = fd_ws:send(Sock, {text, Message}),
|
||||
ws_tetris_loop(Sock, Tetris, Frames, Received);
|
||||
{tcp_closed, Sock} -> {error, tcp_closed};
|
||||
{tcp_error, Sock, Reason} -> {error, {tcp_error, Reason}}
|
||||
after 30_000 ->
|
||||
{error, timeout}
|
||||
end;
|
||||
{error, Reason} ->
|
||||
{error, {inet, Reason}}
|
||||
io:format("~p error: ~p~n", [self(), Error]),
|
||||
http_err(Sock, 500)
|
||||
end.
|
||||
|
||||
%% ------------------------------
|
||||
%% 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_http_utils:http_err(Sock, 500)
|
||||
end.
|
||||
|
||||
ws_echo2(Sock, Request) ->
|
||||
case fd_ws:handshake(Request) of
|
||||
{ok, Response} ->
|
||||
fd_http_utils:respond(Sock, Response),
|
||||
ws_echo_loop(Sock);
|
||||
Error ->
|
||||
tell("ws_echo: error: ~tp", [Error]),
|
||||
fd_http_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 fd_ws:recv(Sock, Received, 5*fd_ws:min(), Frames) of
|
||||
{ok, Message, NewFrames, NewReceived} ->
|
||||
tell("~p echo message: ~tp", [self(), Message]),
|
||||
% send the same message back
|
||||
ok = fd_ws:send(Sock, Message),
|
||||
ws_echo_loop(Sock, NewFrames, NewReceived);
|
||||
Error ->
|
||||
tell(error, "ws_echo_loop: error: ~tp", [Error]),
|
||||
fd_ws:send(Sock, {close, <<>>}),
|
||||
error(Error)
|
||||
end.
|
||||
|
||||
|
||||
%% ------------------------------
|
||||
%% wfc
|
||||
%% ------------------------------
|
||||
|
||||
wfcin(Sock, #request{enctype = json,
|
||||
cookies = Cookies,
|
||||
body = #{"wfcin" := Input}}) ->
|
||||
@ -405,17 +274,17 @@ wfcin(Sock, #request{enctype = json,
|
||||
case wfc_read:expr(Input) of
|
||||
{ok, Expr, _Rest} ->
|
||||
case wfc_eval:eval(Expr, Ctx0) of
|
||||
{ok, noop, Ctx1} -> {fd_http_utils:jsgud("<noop>"), Ctx1};
|
||||
{ok, Sentence, Ctx1} -> {fd_http_utils:jsgud(wfc_pp:sentence(Sentence)), Ctx1};
|
||||
{error, Message} -> {fd_http_utils:jsbad(Message), Ctx0}
|
||||
{ok, noop, Ctx1} -> {jsgud("<noop>"), Ctx1};
|
||||
{ok, Sentence, Ctx1} -> {jsgud(wfc_pp:sentence(Sentence)), Ctx1};
|
||||
{error, Message} -> {jsbad(Message), Ctx0}
|
||||
end;
|
||||
{error, Message} ->
|
||||
{fd_http_utils:jsbad(Message), Ctx0}
|
||||
{jsbad(Message), Ctx0}
|
||||
end
|
||||
catch
|
||||
error:E:S ->
|
||||
ErrorMessage = unicode:characters_to_list(io_lib:format("parser crashed: ~p:~p", [E, S])),
|
||||
{fd_http_utils:jsbad(ErrorMessage), Ctx0}
|
||||
{jsbad(ErrorMessage), Ctx0}
|
||||
end,
|
||||
% update cache with new context
|
||||
ok = fd_cache:set(Cookie, NewCtx),
|
||||
@ -423,30 +292,77 @@ wfcin(Sock, #request{enctype = json,
|
||||
Response = #response{headers = [{"content-type", "application/json"},
|
||||
{"set-cookie", ["wfc=", Cookie]}],
|
||||
body = Body},
|
||||
fd_http_utils:respond(Sock, Response);
|
||||
respond(Sock, Response);
|
||||
wfcin(Sock, Request) ->
|
||||
tell("wfcin: bad request: ~tp", [Request]),
|
||||
fd_http_utils:http_err(Sock, 400).
|
||||
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_cache:query(Cookie) of
|
||||
{ok, Context} -> {Cookie, Context};
|
||||
error -> {Cookie, wfc_eval_context:default()}
|
||||
end;
|
||||
ctx(_) ->
|
||||
{fd_http_utils:new_cookie(), wfc_eval_context:default()}.
|
||||
{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])}.
|
||||
|
||||
@ -1,115 +0,0 @@
|
||||
% @doc http utility functions
|
||||
-module(fd_http_utils).
|
||||
|
||||
-export([
|
||||
new_cookie/0,
|
||||
jsgud/1, jsbad/1,
|
||||
http_err/2,
|
||||
respond/2,
|
||||
fmtresp/1
|
||||
])
|
||||
|
||||
|
||||
-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.1.0",
|
||||
"Date" => qhl:ridiculous_web_date(),
|
||||
"Content-Length" => io_lib:format("~p", [BodySize])}.
|
||||
111
src/fd_sfc.erl
111
src/fd_sfc.erl
@ -1,111 +0,0 @@
|
||||
% @doc static file cache
|
||||
-module(fd_sfc).
|
||||
|
||||
-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_sfc_entry:entry().
|
||||
-type maybe_entry() :: {found, fd_sfc_entry:entry()} | not_found.
|
||||
|
||||
|
||||
-record(s, {base_path = base_path() :: file:filename(),
|
||||
cache = fd_sfc_cache:new(base_path()) :: fd_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_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_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_sfc_cache:new(BasePath),
|
||||
NewState = State#s{cache = NewCache},
|
||||
NewState.
|
||||
@ -1,81 +0,0 @@
|
||||
% @doc
|
||||
% cache data management
|
||||
-module(fd_sfc_cache).
|
||||
|
||||
-export_type([
|
||||
cache/0
|
||||
]).
|
||||
|
||||
-export([
|
||||
query/2,
|
||||
new/0, new/1
|
||||
]).
|
||||
|
||||
-include("$zx_include/zx_logger.hrl").
|
||||
|
||||
-type cache() :: #{HttpPath :: binary() := Entry :: fd_sfc_entry:entry()}.
|
||||
|
||||
|
||||
-spec query(HttpPath, Cache) -> Result
|
||||
when HttpPath :: binary(),
|
||||
Cache :: cache(),
|
||||
Result :: {found, Entry}
|
||||
| not_found,
|
||||
Entry :: fd_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_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.
|
||||
@ -1,99 +0,0 @@
|
||||
% @doc non-servery functions for static file caching
|
||||
%
|
||||
% this spams the filesystem, so it's not "pure" code
|
||||
-module(fd_sfc_entry).
|
||||
|
||||
-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.
|
||||
@ -42,23 +42,11 @@ init([]) ->
|
||||
5000,
|
||||
supervisor,
|
||||
[fd_clients]},
|
||||
Chat = {fd_chat,
|
||||
{fd_chat, start_link, []},
|
||||
permanent,
|
||||
5000,
|
||||
worker,
|
||||
[fd_chat]},
|
||||
FileCache = {fd_sfc,
|
||||
{fd_sfc, start_link, []},
|
||||
permanent,
|
||||
5000,
|
||||
worker,
|
||||
[fd_sfc]},
|
||||
Cache = {fd_cache,
|
||||
{fd_cache, start_link, []},
|
||||
permanent,
|
||||
5000,
|
||||
worker,
|
||||
[fd_cache]},
|
||||
Children = [Clients, Chat, FileCache, Cache],
|
||||
Children = [Clients, Cache],
|
||||
{ok, {RestartStrategy, Children}}.
|
||||
|
||||
@ -1,88 +0,0 @@
|
||||
% @doc tetris
|
||||
%
|
||||
% manages state for a single game of tetris
|
||||
%
|
||||
% sends parent process messages `{tetris, String}` where String is an encoded
|
||||
% JSON blob meant to be sent to the page script in /priv/static/js/ts/tetris.ts
|
||||
%
|
||||
% Refs:
|
||||
% 1. https://www.erlang.org/docs/24/man/gen_server
|
||||
-module(fd_tetris).
|
||||
|
||||
-behavior(gen_server).
|
||||
|
||||
-export([
|
||||
%% caller context
|
||||
start_link/0,
|
||||
%% process context
|
||||
%% gen_server callbacks
|
||||
init/1, handle_call/3, handle_cast/2, handle_info/2,
|
||||
code_change/3, terminate/2
|
||||
]).
|
||||
|
||||
-include("$zx_include/zx_logger.hrl").
|
||||
|
||||
|
||||
-record(s, {parent :: pid()}).
|
||||
|
||||
-type state() :: #s{}.
|
||||
|
||||
%%-----------------------------------------------------------------------------
|
||||
%% caller context below this line
|
||||
%%-----------------------------------------------------------------------------
|
||||
|
||||
-spec ws_msg(Tetris, Message) -> ok
|
||||
when Tetris :: pid(),
|
||||
Message :: fd_ws:ws_msg().
|
||||
|
||||
ws_msg(Tetris, Msg) ->
|
||||
gen_server:cast(Tetris, {ws_msg, Msg}).
|
||||
|
||||
|
||||
-spec start_link() -> {ok, pid()} | {error, term()}.
|
||||
start_link() ->
|
||||
gen_server:start_link(?MODULE, [self()], []).
|
||||
|
||||
|
||||
%%-----------------------------------------------------------------------------
|
||||
%% process context below this line
|
||||
%%-----------------------------------------------------------------------------
|
||||
|
||||
%% gen_server callbacks
|
||||
|
||||
-spec init(Args) -> {ok, State}
|
||||
when Args :: [Parent],
|
||||
Parent :: pid(),
|
||||
State :: state().
|
||||
|
||||
init([Parent]) ->
|
||||
tell("~tp:~tp starting fd_tetris with parent ~p", [?MODULE, self(), Parent]),
|
||||
self() ! {poop, 0},
|
||||
InitState = #s{parent = Parent},
|
||||
{ok, InitState}.
|
||||
|
||||
|
||||
handle_call(Unexpected, From, State) ->
|
||||
tell("~tp:~tp unexpected call from ~tp: ~tp", [?MODULE, self(), From, Unexpected]),
|
||||
{noreply, State}.
|
||||
|
||||
|
||||
handle_cast(Unexpected, State) ->
|
||||
tell("~tp:~tp unexpected cast: ~tp", [?MODULE, self(), Unexpected]),
|
||||
{noreply, State}.
|
||||
|
||||
|
||||
handle_info({poop, N}, State = #s{parent = Parent}) ->
|
||||
Parent ! {tetris, io_lib:format("poop~p", [N])},
|
||||
erlang:send_after(1_000, self(), {poop, N+1}),
|
||||
{noreply, State};
|
||||
handle_info(Unexpected, State) ->
|
||||
tell("~tp:~tp unexpected info: ~tp", [?MODULE, self(), Unexpected]),
|
||||
{noreply, State}.
|
||||
|
||||
|
||||
code_change(_, State, _) ->
|
||||
{ok, State}.
|
||||
|
||||
terminate(_, _) ->
|
||||
ok.
|
||||
812
src/fd_ws.erl
812
src/fd_ws.erl
@ -1,812 +0,0 @@
|
||||
% @doc websockets
|
||||
%
|
||||
% ref: https://datatracker.ietf.org/doc/html/rfc6455
|
||||
-module(fd_ws).
|
||||
|
||||
-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,
|
||||
send/2
|
||||
]).
|
||||
|
||||
-include("http.hrl").
|
||||
-include("$zx_include/zx_logger.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(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) ->
|
||||
case inet:setopts(Sock, [{active, once}]) of
|
||||
ok ->
|
||||
receive
|
||||
{tcp, Sock, Bin} -> 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.
|
||||
|
||||
|
||||
|
||||
-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}) ->
|
||||
log(info, "fd_ws: send(~tp, {~tp, ~tp})", [Socket, Type, Payload]),
|
||||
BPayload = payload_to_binary(Payload),
|
||||
log(info, "fd_ws: BPayload = ~tp", [BPayload]),
|
||||
Frame = message_to_frame(Type, BPayload),
|
||||
log(info, "fd_ws: Frame = ~tp", [Frame]),
|
||||
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),
|
||||
log(info, "send_frame: rendered frame: ~tp", [Binary]),
|
||||
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>>.
|
||||
102
src/fd_wsp.erl
102
src/fd_wsp.erl
@ -1,102 +0,0 @@
|
||||
% @doc Abstracts a web socket into a process
|
||||
%
|
||||
% hands the TCP socket over to this process, also this process does the
|
||||
% handshake.
|
||||
%
|
||||
% this process sends back `{ws, self(), Message: fd_ws:ws_msg()}'
|
||||
%
|
||||
% for each websocket message it gets
|
||||
-module(fd_wsp).
|
||||
|
||||
-behavior(gen_server).
|
||||
|
||||
-export_type([
|
||||
|
||||
]).
|
||||
|
||||
-export([
|
||||
%% caller context
|
||||
handshake/0,
|
||||
start_link/0,
|
||||
|
||||
%% process context
|
||||
init/1, handle_call/3, handle_cast/2, handle_info/2,
|
||||
code_change/3, terminate/2
|
||||
]).
|
||||
|
||||
-include("http.hrl").
|
||||
-include("$zx_include/zx_logger.hrl").
|
||||
|
||||
-record(s, {socket :: gen_tcp:socket()})
|
||||
-type state() :: #s{}.
|
||||
|
||||
|
||||
%%-----------------------------------------------------------------------------
|
||||
%% caller context
|
||||
%%-----------------------------------------------------------------------------
|
||||
|
||||
|
||||
-spec start_link(Socket, HandshakeReq, Received) -> Result
|
||||
when Socket :: gen_tcp:socket(),
|
||||
HandshakeReq :: request(),
|
||||
Received :: binary(),
|
||||
Result :: {ok, pid()}
|
||||
| {error, term()}.
|
||||
% @doc
|
||||
% starts a websocket and hands control of socket over to child process
|
||||
|
||||
start_link(Socket, HandshakeReq, Received) ->
|
||||
case gen_server:start_link(?MODULE, [Socket, HandshakeReq, Received], []) of
|
||||
{ok, PID} ->
|
||||
gen_tcp:controlling_process(Socket, PID),
|
||||
{ok, PID};
|
||||
Error ->
|
||||
Error
|
||||
end.
|
||||
|
||||
|
||||
%%-----------------------------------------------------------------------------
|
||||
%% process context below this line
|
||||
%%-----------------------------------------------------------------------------
|
||||
|
||||
%% gen_server callbacks
|
||||
|
||||
init([Socket, HandshakeReq, Received]) ->
|
||||
log("~p:~p init", [?MODULE, self()]),
|
||||
case fd_ws:handshake(HandshakeReq) of
|
||||
{ok, Response} ->
|
||||
ok = fd_http_utils:respond(Sock, Response),
|
||||
InitState = #s{socket = Socket},
|
||||
Error ->
|
||||
tell("~p:~p websocket handshake err: ~p", [?MODULE, self(), Error]),
|
||||
fd_http_utils:http_err(Socket, 400)
|
||||
Error
|
||||
end.
|
||||
|
||||
|
||||
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({tcp, Sock, Bytes}, State = #s{socket = Sock}) ->
|
||||
handle_info(Unexpected, State) ->
|
||||
tell("~tp: unexpected info: ~tp", [?MODULE, Unexpected]),
|
||||
{noreply, State}.
|
||||
|
||||
|
||||
code_change(_, State, _) ->
|
||||
{ok, State}.
|
||||
|
||||
terminate(_, _) ->
|
||||
ok.
|
||||
|
||||
|
||||
%%-----------------------------------------------------------------------------
|
||||
%% internals
|
||||
%%-----------------------------------------------------------------------------
|
||||
27
src/qhl.erl
27
src/qhl.erl
@ -49,52 +49,62 @@ 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};
|
||||
@ -107,6 +117,7 @@ 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};
|
||||
@ -130,6 +141,7 @@ 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};
|
||||
@ -141,10 +153,12 @@ 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);
|
||||
@ -514,6 +528,7 @@ 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};
|
||||
@ -811,9 +826,11 @@ 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 ->
|
||||
@ -828,11 +845,15 @@ 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} ->
|
||||
{error, {tcp_error, Reason}}
|
||||
%X ->
|
||||
after 3_000 ->
|
||||
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, timeout}
|
||||
end;
|
||||
accumulate(_, 0, Received) ->
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user