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

support safari with a workaround, clean up code a bit

Browse source
This commit is contained in:
Toshit Chawda 2024-07-12 21:13:11 -07:00
parent e82c0f0d08
commit 63211161f1
No known key found for this signature in database
GPG key ID: 91480ED99E2B3D9D
3 changed files with 29 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/client.ts
View file

@ -1,5 +1,5 @@
import { BareHeaders, BareTransport, maxRedirects } from './baretypes';
import { WorkerConnection, WorkerMessage, WorkerResponse } from './connection';
import { BareHeaders, maxRedirects } from './baretypes';
import { WorkerConnection, WorkerMessage } from './connection';
import { WebSocketFields } from './snapshot';
const validChars =
@ -17,12 +17,6 @@ export function validProtocol(protocol: string): boolean {
return true;
}
// get the unhooked value
const getRealReadyState = Object.getOwnPropertyDescriptor(
WebSocket.prototype,
'readyState'
)!.get!;
const wsProtocols = ['ws:', 'wss:'];
const statusEmpty = [101, 204, 205, 304];
const statusRedirect = [301, 302, 303, 307, 308];
@ -238,7 +232,7 @@ export class BareClient {
}
};
const onclose = (code, reason) => {
const onclose = (code: number, reason: string) => {
fakeReadyState = WebSocketFields.CLOSED;
socket.dispatchEvent(new CloseEvent("close", { code, reason }));
};

21
src/connection.ts
View file

@ -8,7 +8,7 @@ export type WorkerMessage = {
remote: string,
method: string,
headers: BareHeaders,
body: ReadableStream | undefined,
body: ReadableStream | ArrayBuffer | undefined,
}
websocket?: {
url: string,
@ -96,6 +96,25 @@ function createPort(path: string, registerHandlers: boolean): MessagePort {
return worker.port;
}
let browserSupportsTransferringStreamsCache: boolean | null = null;
export function browserSupportsTransferringStreams(): boolean {
if (browserSupportsTransferringStreamsCache === null) {
const chan = new MessageChannel();
const stream = new ReadableStream();
let res: boolean;
try {
chan.port1.postMessage(stream, [stream]);
res = true;
} catch(err) {
res = false;
}
browserSupportsTransferringStreamsCache = res;
return res;
} else {
return browserSupportsTransferringStreamsCache;
}
}
export class WorkerConnection {
channel: BroadcastChannel;
port: MessagePort | Promise<MessagePort>;

7
src/worker.ts
View file

@ -1,5 +1,5 @@
import { BareTransport } from "./baretypes";
import { BroadcastMessage, WorkerMessage, WorkerResponse } from "./connection"
import { BroadcastMessage, WorkerMessage, WorkerResponse, browserSupportsTransferringStreams } from "./connection"
let currentTransport: BareTransport | null = null;
let currentTransportName: string = "";
@ -51,6 +51,11 @@ function handleConnection(port: MessagePort) {
null
);
if (!browserSupportsTransferringStreams() && resp.body instanceof ReadableStream) {
const conversionResp = new Response(resp.body);
resp.body = await conversionResp.arrayBuffer();
}
if (resp.body instanceof ReadableStream || resp.body instanceof ArrayBuffer) {
port.postMessage(<WorkerResponse>{ type: "fetch", fetch: resp }, [resp.body]);
} else {