Skip to content

Browser Dialer: Change from ES5 to ES6+ for performance #3832

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mmmray merged 2 commits into from
Sep 19, 2024
Merged

Browser Dialer: Change from ES5 to ES6+ for performance #3832

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62f811e
Uses ES6+ syntax for aggressive JIT optimizations
PoneyClairDeLune Sep 19, 2024
d163fe5
Switch in JS is vastly faster than if-else chains
PoneyClairDeLune Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
221 changes: 115 additions & 106 deletions transport/internet/browser_dialer/dialer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,132 +5,141 @@
</head>
<body>
<script>
"use strict";
// Enable a much more aggressive JIT for performance gains

// Copyright (c) 2021 XRAY. Mozilla Public License 2.0.
var url = "ws://" + window.location.host + "/websocket?token=csrfToken";
var clientIdleCount = 0;
var upstreamGetCount = 0;
var upstreamWsCount = 0;
var upstreamPostCount = 0;
setInterval(check, 1000);
function check() {
let url = "ws://" + window.location.host + "/websocket?token=csrfToken";
let clientIdleCount = 0;
let upstreamGetCount = 0;
let upstreamWsCount = 0;
let upstreamPostCount = 0;
let check = function () {
if (clientIdleCount > 0) {
return;
}

};
clientIdleCount += 1;
console.log("Prepare", url);
var ws = new WebSocket(url);
let ws = new WebSocket(url);
// arraybuffer is significantly faster in chrome than default
// blob, tested with chrome 123
ws.binaryType = "arraybuffer";
ws.onmessage = function (event) {
ws.addEventListener("message", (event) => {
clientIdleCount -= 1;
let [method, url, protocol] = event.data.split(" ");
if (method == "WS") {
upstreamWsCount += 1;
console.log("Dial WS", url, protocol);
const wss = new WebSocket(url, protocol);
wss.binaryType = "arraybuffer";
var opened = false;
ws.onmessage = function (event) {
wss.send(event.data)
}
wss.onopen = function (event) {
opened = true;
ws.send("ok")
}
wss.onmessage = function (event) {
ws.send(event.data)
}
wss.onclose = function (event) {
upstreamWsCount -= 1;
console.log("Dial WS DONE, remaining: ", upstreamWsCount);
ws.close()
}
wss.onerror = function (event) {
!opened && ws.send("fail")
wss.close()
}
ws.onclose = function (event) {
wss.close()
}
} else if (method == "GET") {
(async () => {
console.log("Dial GET", url);
ws.send("ok");
const controller = new AbortController();
switch (method) {
case "WS": {
upstreamWsCount += 1;
console.log("Dial WS", url, protocol);
const wss = new WebSocket(url, protocol);
wss.binaryType = "arraybuffer";
let opened = false;
ws.onmessage = function (event) {
wss.send(event.data)
};
wss.onopen = function (event) {
opened = true;
ws.send("ok")
};
wss.onmessage = function (event) {
ws.send(event.data)
};
wss.onclose = function (event) {
upstreamWsCount -= 1;
console.log("Dial WS DONE, remaining: ", upstreamWsCount);
ws.close()
};
wss.onerror = function (event) {
!opened && ws.send("fail")
wss.close()
};
ws.onclose = function (event) {
wss.close()
};
break;
};
case "GET": {
(async () => {
console.log("Dial GET", url);
ws.send("ok");
const controller = new AbortController();

/*
Aborting a streaming response in JavaScript
requires two levers to be pulled:
/*
Aborting a streaming response in JavaScript
requires two levers to be pulled:

First, the streaming read itself has to be cancelled using
reader.cancel(), only then controller.abort() will actually work.
First, the streaming read itself has to be cancelled using
reader.cancel(), only then controller.abort() will actually work.

If controller.abort() alone is called while a
reader.read() is ongoing, it will block until the server closes the
response, the page is refreshed or the network connection is lost.
*/
If controller.abort() alone is called while a
reader.read() is ongoing, it will block until the server closes the
response, the page is refreshed or the network connection is lost.
*/

let reader = null;
ws.onclose = (event) => {
try {
reader && reader.cancel();
} catch(e) {}
let reader = null;
ws.onclose = (event) => {
try {
reader && reader.cancel();
} catch(e) {};

try {
controller.abort();
} catch(e) {}
}
try {
controller.abort();
} catch(e) {};
};

try {
upstreamGetCount += 1;
const response = await fetch(url, {signal: controller.signal});
try {
upstreamGetCount += 1;
const response = await fetch(url, {signal: controller.signal});

const body = await response.body;
reader = body.getReader();
const body = await response.body;
reader = body.getReader();

while (true) {
const { done, value } = await reader.read();
ws.send(value);
if (done) break;
}
} finally {
upstreamGetCount -= 1;
console.log("Dial GET DONE, remaining: ", upstreamGetCount);
ws.close();
}
})()
} else if (method == "POST") {
upstreamPostCount += 1;
console.log("Dial POST", url);
ws.send("ok");
ws.onmessage = async (event) => {
try {
const response = await fetch(
url,
{method: "POST", body: event.data}
);
if (response.ok) {
ws.send("ok");
} else {
console.error("bad status code");
ws.send("fail");
}
} finally {
upstreamPostCount -= 1;
console.log("Dial POST DONE, remaining: ", upstreamPostCount);
ws.close();
}
while (true) {
const { done, value } = await reader.read();
ws.send(value);
if (done) break;
};
} finally {
upstreamGetCount -= 1;
console.log("Dial GET DONE, remaining: ", upstreamGetCount);
ws.close();
};
})();
break;
};
case "POST": {
upstreamPostCount += 1;
console.log("Dial POST", url);
ws.send("ok");
ws.onmessage = async (event) => {
try {
const response = await fetch(
url,
{method: "POST", body: event.data}
);
if (response.ok) {
ws.send("ok");
} else {
console.error("bad status code");
ws.send("fail");
};
} finally {
upstreamPostCount -= 1;
console.log("Dial POST DONE, remaining: ", upstreamPostCount);
ws.close();
};
};
break;
};
}
};

check()
}
ws.onerror = function (event) {
ws.close()
}
}
check();
});
ws.addEventListener("error", (event) => {
ws.close();
});
};
let checkTask = setInterval(check, 1000);
</script>
</body>
</html>