mercuryworkshop-mirror/bare-mux
1
0
Fork 0
mirror of https://github.com/MercuryWorkshop/bare-mux.git synced 2025-05-16 15:40:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix websockets

Browse source
This commit is contained in:
CoolElectronics 2024-03-02 11:39:08 -05:00
parent 5a5a5debdb
commit 95c4c25cbc
No known key found for this signature in database
GPG key ID: F63593D168636C50
6 changed files with 88 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

43
dist/index.js vendored
View file

@ -100,7 +100,7 @@ class BareClient {
* Create a BareClient. Calls to fetch and connect will wait for an implementation to be ready.
*/
constructor() { }
createWebSocket(remote, protocols = [], webSocketImpl, requestHeaders) {
createWebSocket(remote, protocols = [], webSocketImpl, requestHeaders, arrayBufferImpl) {
let switcher = findSwitcher();
let client = switcher.active;
if (!client)
@ -133,7 +133,15 @@ class BareClient {
initialErrorHappened = true;
}
});
let initialCloseHappened = false;
socket.addEventListener("close", (e) => {
if (!initialCloseHappened) {
e.stopImmediatePropagation();
initialCloseHappened = true;
}
});
// TODO socket onerror will be broken
arrayBufferImpl = arrayBufferImpl || webSocketImpl.constructor.constructor("return ArrayBuffer")().prototype;
requestHeaders['Host'] = (new URL(remote)).host;
// requestHeaders['Origin'] = origin;
requestHeaders['Pragma'] = 'no-cache';
@ -150,20 +158,27 @@ class BareClient {
}
}; // what the fuck is a meta
socket.dispatchEvent(new Event("open"));
}, (payload) => {
console.log(payload);
if (payload.data) {
socket.dispatchEvent(new MessageEvent("message", { data: payload.data }));
return;
}, async (payload) => {
if (typeof payload === "string") {
socket.dispatchEvent(new MessageEvent("message", { data: payload }));
}
else if ("byteLength" in payload) {
if (socket.binaryType === "blob") {
payload = new Blob([payload]);
}
else {
Object.setPrototypeOf(payload, arrayBufferImpl);
}
socket.dispatchEvent(new MessageEvent("message", { data: payload }));
}
else if ("arrayBuffer" in payload) {
if (socket.binaryType === "arraybuffer") {
payload = await payload.arrayBuffer();
Object.setPrototypeOf(payload, arrayBufferImpl);
console.log(payload);
}
socket.dispatchEvent(new MessageEvent("message", { data: payload }));
}
socket.dispatchEvent(new MessageEvent("message", { data: payload }));
// if (typeof payload === "string") {
// } else if (payload instanceof ArrayBuffer) {
// Object.setPrototypeOf(payload, ArrayBuffer);
//
// socket.dispatchEvent(new MessageEvent("message", { data: payload }));
// } else if (payload instanceof Blob) {
// }
}, (code, reason) => {
fakeReadyState = WebSocketFields.CLOSED;
socket.dispatchEvent(new CloseEvent("close", { code, reason }));