reorganize client code

This commit is contained in:
ading2210 2024-01-02 01:25:04 -05:00
parent 27aa9ff74c
commit 643fc8e463
8 changed files with 32 additions and 26 deletions

12
.gitignore vendored
View file

@ -1,8 +1,6 @@
/curl
/curl-wasm
/openssl
/openssl-wasm
/client/build
/client/out
/client/cacert.pem
/client/libcurl.data
/srelay*
/websockify
/a.out*
/cacert.pem
/websockify

View file

@ -1,6 +0,0 @@
#!/bin/bash
if [ ! -f cacert.pem ]; then
wget "https://curl.se/ca/cacert.pem"
fi
emcc main.c -lcurl -lssl -lcrypto -I curl-wasm/include/ -L curl-wasm/lib/ -lwebsocket.js -sWEBSOCKET_URL=wss://debug.ading.dev/ws -pthread -sPROXY_TO_PTHREAD --preload-file cacert.pem -Os

19
client/build.sh Executable file
View file

@ -0,0 +1,19 @@
#!/bin/bash
INCLUDE_DIR="build/curl-wasm/include/"
LIB_DIR="build/curl-wasm/lib/"
CACERT_FILE="cacert.pem"
OUT_FILE="out/libcurl.js"
EXPORTED_FUNCS="_main"
COMPILER_OPTIONS="-o $OUT_FILE -Os -lcurl -lssl -lcrypto -I $INCLUDE_DIR -L $LIB_DIR"
EMSCRIPTEN_OPTIONS="-lwebsocket.js -sWEBSOCKET_URL=wss://debug.ading.dev/ws -pthread -sPROXY_TO_PTHREAD -sEXPORTED_FUNCTIONS=$EXPORTED_FUNCS --preload-file $CACERT_FILE"
if [ ! -f $CACERT_FILE ]; then
wget "https://curl.se/ca/cacert.pem" -O $CACERT_FILE
fi
COMPILE_CMD="emcc main.c $COMPILER_OPTIONS $EMSCRIPTEN_OPTIONS"
echo $COMPILE_CMD
$COMPILE_CMD
mv out/libcurl.data ./

View file

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<script src="./a.out.js"></script>
<script src="./out/libcurl.js"></script>
<script src="./main.js"></script>
</head>
<body>

View file

@ -31,4 +31,4 @@ int main() {
curl_easy_cleanup(curl);
}
return 0;
}
}

View file

@ -1,21 +1,16 @@
const wsproxy_base = "wss://anura.pro/";
const cacert_path = "./out/cacert.peem";
const websocket_url = `wss://${location.hostname}/ws`;
function allocate_str(str) {
return allocate(intArrayFromString(str), ALLOC_NORMAL);
}
function websocket_connect(websocket) {
return new Promise((resolve, reject) => {
websocket.onopen = () => {resolve()}
websocket.onerror = () => {reject()}
})
}
async function main() {
}
window.onload = () => {
console.log("page loaded, waiting for emscripten module load");
//Module.websocket.url = websocket_url;
Module.onRuntimeInitialized = main;
};

View file

@ -3,8 +3,8 @@
#compile openssl for use with emscripten
CORE_COUNT=$(nproc --all)
PREFIX=$(realpath curl-wasm)
OPENSSL_PREFIX=$(realpath openssl-wasm)
PREFIX=$(realpath build/curl-wasm)
OPENSSL_PREFIX=$(realpath build/openssl-wasm)
mkdir -p $PREFIX
rm -rf curl

View file

@ -3,7 +3,7 @@
#compile openssl for use with emscripten
CORE_COUNT=$(nproc --all)
PREFIX=$(realpath openssl-wasm)
PREFIX=$(realpath build/openssl-wasm)
mkdir -p $PREFIX
rm -rf openssl