firefox support (kinda with manual permission set)

src/backend/extension/streams.ts

@@ -34,7 +34,7 @@ function buildHeadersFromStream(stream: Stream): Record<string, string> {
 
 export async function prepareStream(stream: Stream) {
   await setDomainRule({
-    ruleId: 1,
+    ruleId: 2,
     targetDomains: extractDomainsFromStream(stream),
     requestHeaders: buildHeadersFromStream(stream),
   });

src/backend/providers/fetchers.ts

@@ -1,9 +1,11 @@
 import { Fetcher, makeSimpleProxyFetcher } from "@movie-web/providers";
 
-import { sendExtensionRequest } from "@/backend/extension/messaging";
+import { setDomainRule } from "@/backend/extension/messaging";
 import { getApiToken, setApiToken } from "@/backend/helpers/providerApi";
 import { getProviderApiUrls, getProxyUrls } from "@/utils/proxyUrls";
 
+import { makeFullUrl } from "./utils";
+
 function makeLoadbalancedList(getter: () => string[]) {
   let listIndex = -1;
   return () => {
@@ -67,17 +69,31 @@ function makeFinalHeaders(
 
 export function makeExtensionFetcher() {
   const fetcher: Fetcher = async (url, ops) => {
-    const result = await sendExtensionRequest<any>({
+    const fullUrl = makeFullUrl(url, ops);
-      url,
+    const res = await setDomainRule({
-      ...ops,
+      ruleId: 1,
+      targetDomains: [fullUrl],
+      requestHeaders: ops.headers,
     });
-    if (!result?.success) throw new Error(`extension error: ${result?.error}`);
+    console.log(res, fullUrl);
-    const res = result.response;
+    const response = await fetch(fullUrl, {
+      method: ops.method,
+      headers: ops.headers,
+      body: ops.body as any,
+    });
+    const contentType = response.headers.get("content-type");
+    const body = contentType?.includes("application/json")
+      ? await response.json()
+      : await response.text();
+
     return {
-      body: res.body,
+      body,
-      finalUrl: res.finalUrl,
+      finalUrl: response.url,
-      statusCode: res.statusCode,
+      statusCode: response.status,
-      headers: makeFinalHeaders(ops.readHeaders, res.headers),
+      headers: makeFinalHeaders(
+        ops.readHeaders,
+        Object.fromEntries(response.headers.entries()),
+      ),
     };
   };
   return fetcher;

src/backend/providers/utils.ts

@@ -0,0 +1,29 @@
+import { DefaultedFetcherOptions } from "@movie-web/providers";
+
+export function makeFullUrl(
+  url: string,
+  ops?: DefaultedFetcherOptions,
+): string {
+  // glue baseUrl and rest of url together
+  let leftSide = ops?.baseUrl ?? "";
+  let rightSide = url;
+
+  // left side should always end with slash, if its set
+  if (leftSide.length > 0 && !leftSide.endsWith("/")) leftSide += "/";
+
+  // right side should never start with slash
+  if (rightSide.startsWith("/")) rightSide = rightSide.slice(1);
+
+  const fullUrl = leftSide + rightSide;
+  if (!fullUrl.startsWith("http://") && !fullUrl.startsWith("https://"))
+    throw new Error(
+      `Invald URL -- URL doesn't start with a http scheme: '${fullUrl}'`,
+    );
+
+  const parsedUrl = new URL(fullUrl);
+  Object.entries(ops?.query ?? {}).forEach(([k, v]) => {
+    parsedUrl.searchParams.set(k, v as string);
+  });
+
+  return parsedUrl.toString();
+}