mercuryworkshop-mirror/libcurl.js
1
0
Fork 0
mirror of https://github.com/ading2210/libcurl.js.git synced 2025-05-11 13:30:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Merge pull request #5 from Percslol/main"

Browse source 
This reverts commit 2067592b7b, reversing
changes made to 82249fe707.
This commit is contained in:
ading2210 2024-12-26 00:12:57 -05:00
parent ca8a886757
commit 7648eecd7a
6 changed files with 12 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -1,3 +1,6 @@
[submodule "client/wisp_client"]
path = client/wisp_client
url = https://github.com/MercuryWorkshop/wisp-client-js
[submodule "server/wisp_server"] [submodule "server/wisp_server"]
path = server/wisp_server path = server/wisp_server
url = https://github.com/MercuryWorkshop/wisp-server-python url = https://github.com/MercuryWorkshop/wisp-server-python

7
client/build.sh
View file

@ -8,7 +8,7 @@ BUILD_DIR="build"
C_DIR="libcurl" C_DIR="libcurl"
FRAGMENTS_DIR="fragments" FRAGMENTS_DIR="fragments"
JAVSCRIPT_DIR="javascript" JAVSCRIPT_DIR="javascript"
WISP_CLIENT="$BUILD_DIR/wisp-js/package" WISP_CLIENT="wisp_client"
INCLUDE_DIR="$BUILD_DIR/curl-wasm/include/" INCLUDE_DIR="$BUILD_DIR/curl-wasm/include/"
LIB_DIR="$BUILD_DIR/curl-wasm/lib/" LIB_DIR="$BUILD_DIR/curl-wasm/lib/"
@ -80,7 +80,6 @@ fi
#ensure deps are compiled #ensure deps are compiled
tools/all_deps.sh tools/all_deps.sh
tools/generate_cert.sh tools/generate_cert.sh
tools/wisp_client.sh
#compile the main c file #compile the main c file
COMPILE_CMD="emcc $C_DIR/*.c $COMPILER_OPTIONS $EMSCRIPTEN_OPTIONS" COMPILE_CMD="emcc $C_DIR/*.c $COMPILER_OPTIONS $EMSCRIPTEN_OPTIONS"
@ -115,7 +114,9 @@ sed -i "/__extra_libraries__/r $JAVSCRIPT_DIR/messages.js" $OUT_FILE
sed -i "/__extra_libraries__/r $JAVSCRIPT_DIR/util.js" $OUT_FILE sed -i "/__extra_libraries__/r $JAVSCRIPT_DIR/util.js" $OUT_FILE
sed -i "/__extra_libraries__/r $JAVSCRIPT_DIR/logger.js" $OUT_FILE sed -i "/__extra_libraries__/r $JAVSCRIPT_DIR/logger.js" $OUT_FILE
sed -i "/__extra_libraries__/r $WISP_CLIENT/dist/wisp-client.js" $OUT_FILE sed -i "/__extra_libraries__/r $WISP_CLIENT/polyfill.js" $OUT_FILE
sed -i "/__extra_libraries__/r $WISP_CLIENT/wisp.js" $OUT_FILE
#apply patches #apply patches
python3 tools/patch_js.py $FRAGMENTS_DIR $OUT_FILE python3 tools/patch_js.py $FRAGMENTS_DIR $OUT_FILE

2
client/fragments/wisp_support.js
View file

@ -3,7 +3,7 @@ ws ?= ?new WebSocketConstructor\(url, ?opts\)
*/ */
try { try {
if (api.transport === "wisp") { if (api.transport === "wisp") {
ws = new wisp_client.client.WispWebSocket(url); ws = new WispWebSocket(url);
} }
else if (api.transport === "wsproxy") { else if (api.transport === "wsproxy") {
ws = new WebSocket(url); ws = new WebSocket(url);

6
client/javascript/main.js
View file

@ -130,9 +130,9 @@ api = {
get_error_string: get_error_str, get_error_string: get_error_str,
wisp: { wisp: {
wisp_connections: wisp_client.client._wisp_connections, wisp_connections: _wisp_connections,
WispConnection: wisp_client.client.ClientConnection, WispConnection: WispConnection,
WispWebSocket: wisp_client.client.WispWebSocket WispWebSocket: WispWebSocket
}, },
transport: "wisp", transport: "wisp",

20
client/tools/wisp_client.sh
View file

@ -1,20 +0,0 @@
#!/bin/bash
#download and extract wisp-js
set -e
VERSION="0.3.3"
PREFIX=$(realpath build/wisp-js)
TARBALL_PATH="$(realpath build/wisp-archive.tar.gz)"
TARBALL_URL=$(npm view @mercuryworkshop/wisp-js@$VERSION dist.tarball)
if [ -d "$PREFIX" ]; then
exit
fi
rm -rf $PREFIX
mkdir -p $PREFIX
wget $TARBALL_URL -O $TARBALL_PATH
tar xf $TARBALL_PATH -C $PREFIX
rm $TARBALL_PATH

1
client/wisp_client Submodule

@ -0,0 +1 @@
Subproject commit 6aa58be0897501ac444b38e7e7c0008da24f79ba