mirror of
https://github.com/MercuryWorkshop/bare-mux.git
synced 2025-05-15 07:10:00 -04:00
support safari with a workaround, clean up code a bit
This commit is contained in:
parent
e82c0f0d08
commit
63211161f1
3 changed files with 29 additions and 11 deletions
|
@ -1,5 +1,5 @@
|
||||||
import { BareHeaders, BareTransport, maxRedirects } from './baretypes';
|
import { BareHeaders, maxRedirects } from './baretypes';
|
||||||
import { WorkerConnection, WorkerMessage, WorkerResponse } from './connection';
|
import { WorkerConnection, WorkerMessage } from './connection';
|
||||||
import { WebSocketFields } from './snapshot';
|
import { WebSocketFields } from './snapshot';
|
||||||
|
|
||||||
const validChars =
|
const validChars =
|
||||||
|
@ -17,12 +17,6 @@ export function validProtocol(protocol: string): boolean {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
// get the unhooked value
|
|
||||||
const getRealReadyState = Object.getOwnPropertyDescriptor(
|
|
||||||
WebSocket.prototype,
|
|
||||||
'readyState'
|
|
||||||
)!.get!;
|
|
||||||
|
|
||||||
const wsProtocols = ['ws:', 'wss:'];
|
const wsProtocols = ['ws:', 'wss:'];
|
||||||
const statusEmpty = [101, 204, 205, 304];
|
const statusEmpty = [101, 204, 205, 304];
|
||||||
const statusRedirect = [301, 302, 303, 307, 308];
|
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;
|
fakeReadyState = WebSocketFields.CLOSED;
|
||||||
socket.dispatchEvent(new CloseEvent("close", { code, reason }));
|
socket.dispatchEvent(new CloseEvent("close", { code, reason }));
|
||||||
};
|
};
|
||||||
|
|
|
@ -8,7 +8,7 @@ export type WorkerMessage = {
|
||||||
remote: string,
|
remote: string,
|
||||||
method: string,
|
method: string,
|
||||||
headers: BareHeaders,
|
headers: BareHeaders,
|
||||||
body: ReadableStream | undefined,
|
body: ReadableStream | ArrayBuffer | undefined,
|
||||||
}
|
}
|
||||||
websocket?: {
|
websocket?: {
|
||||||
url: string,
|
url: string,
|
||||||
|
@ -96,6 +96,25 @@ function createPort(path: string, registerHandlers: boolean): MessagePort {
|
||||||
return worker.port;
|
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 {
|
export class WorkerConnection {
|
||||||
channel: BroadcastChannel;
|
channel: BroadcastChannel;
|
||||||
port: MessagePort | Promise<MessagePort>;
|
port: MessagePort | Promise<MessagePort>;
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import { BareTransport } from "./baretypes";
|
import { BareTransport } from "./baretypes";
|
||||||
import { BroadcastMessage, WorkerMessage, WorkerResponse } from "./connection"
|
import { BroadcastMessage, WorkerMessage, WorkerResponse, browserSupportsTransferringStreams } from "./connection"
|
||||||
|
|
||||||
let currentTransport: BareTransport | null = null;
|
let currentTransport: BareTransport | null = null;
|
||||||
let currentTransportName: string = "";
|
let currentTransportName: string = "";
|
||||||
|
@ -51,6 +51,11 @@ function handleConnection(port: MessagePort) {
|
||||||
null
|
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) {
|
if (resp.body instanceof ReadableStream || resp.body instanceof ArrayBuffer) {
|
||||||
port.postMessage(<WorkerResponse>{ type: "fetch", fetch: resp }, [resp.body]);
|
port.postMessage(<WorkerResponse>{ type: "fetch", fetch: resp }, [resp.body]);
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue