Merge branch 'main' of https://github.com/MercuryWorkshop/aerojet

src/client/index.ts

@@ -1,3 +1,5 @@
+import BareClient from "@mercuryworkshop/bare-mux";
+
 import "./scope.ts";
 import "./window.ts";
 import "./event.ts";
@@ -21,5 +23,10 @@ declare global {
 	interface Window {
 		$s: any;
 		$sImport: any;
+		$client: BareClient;
 	}
 }
+
+const client = new BareClient();
+
+export { client };

src/client/requests/fetch.ts

@@ -1,13 +1,19 @@
 // ts throws an error if you dont do window.fetch
 
 import { encodeUrl, rewriteHeaders } from "../shared";
+import { client } from "../index";
 
 window.fetch = new Proxy(window.fetch, {
-	apply(target, thisArg, argArray) {
+	async apply(target, thisArg, argArray) {
-		argArray[0] = encodeUrl(argArray[0]);
+		// @ts-expect-error
+		const response = await client.fetch(...argArray);
 
-		return Reflect.apply(target, thisArg, argArray);
+		return new Response(response.body, {
-	},
+			status: response.status,
+			statusText: response.statusText,
+			headers: response.headers
+		});
+	}
 });
 
 Headers = new Proxy(Headers, {

src/client/requests/websocket.ts

@@ -1,6 +1,5 @@
 import { decodeUrl } from "../../shared/rewriters/url";
-import { BareClient } from "../shared";
+import { client } from "../index";
-const client = new BareClient();
 
 WebSocket = new Proxy(WebSocket, {
 	construct(target, args) {