From 314ab969e5197b3b7ea9196582d44c2296ca9414 Mon Sep 17 00:00:00 2001
From: WardPearce <wardpearce@pm.me>
Date: Thu, 30 Apr 2026 02:37:09 +1200
Subject: [PATCH] Use invidious instance as base for manifest

---
 .../.idea/deploymentTargetSelector.xml        |  2 +-
 materialious/electron/package-lock.json       | 14 ++++++++--
 materialious/electron/package.json            |  3 ++-
 .../electron/src/rt/electron-plugins.js       |  2 ++
 materialious/package-lock.json                |  4 +--
 materialious/src/lib/fetchProxy.ts            |  4 +++
 materialious/src/lib/player/manifest.ts       | 26 ++++---------------
 7 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/materialious/android/.idea/deploymentTargetSelector.xml b/materialious/android/.idea/deploymentTargetSelector.xml
index 39df8ee0..e3239429 100644
--- a/materialious/android/.idea/deploymentTargetSelector.xml
+++ b/materialious/android/.idea/deploymentTargetSelector.xml
@@ -4,7 +4,7 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2026-04-29T13:30:29.789814037Z">
+        <DropdownSelection timestamp="2026-04-29T14:13:42.770873710Z">
           <Target type="DEFAULT_BOOT">
             <handle>
               <DeviceId pluginId="LocalEmulator" identifier="path=/home/wpearce/.android/avd/Pixel_9.avd" />
diff --git a/materialious/electron/package-lock.json b/materialious/electron/package-lock.json
index a1999a2e..1117c429 100644
--- a/materialious/electron/package-lock.json
+++ b/materialious/electron/package-lock.json
@@ -1,17 +1,18 @@
 {
 	"name": "Materialious",
-	"version": "1.16.25",
+	"version": "1.16.26",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "Materialious",
-			"version": "1.16.25",
+			"version": "1.16.26",
 			"license": "MIT",
 			"dependencies": {
 				"@capacitor-community/electron": "^5.0.0",
 				"@types/jsdom": "^28.0.1",
 				"bgutils-js": "^3.2.0",
+				"capacitor-nodejs": "https://github.com/hampoelz/capacitor-nodejs/releases/download/v1.0.0-beta.9/capacitor-nodejs.tgz",
 				"chokidar": "~5.0.0",
 				"electron-is-dev": "~2.0.0",
 				"electron-serve": "~3.0.0",
@@ -2515,6 +2516,15 @@
 				"node": ">= 0.4"
 			}
 		},
+		"node_modules/capacitor-nodejs": {
+			"version": "1.0.0-beta.9",
+			"resolved": "https://github.com/hampoelz/capacitor-nodejs/releases/download/v1.0.0-beta.9/capacitor-nodejs.tgz",
+			"integrity": "sha512-4EU/QBolfuyHiMtwd1nxZ4wsK243tGE4VttKvVBG+x1yQuK9EIlEf3lbRjFXfjrJMTZNCqaP6glmdfj9Zo7KVg==",
+			"license": "MIT",
+			"peerDependencies": {
+				"@capacitor/core": ">=7.0.0"
+			}
+		},
 		"node_modules/chalk": {
 			"version": "4.1.2",
 			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
diff --git a/materialious/electron/package.json b/materialious/electron/package.json
index 8107d177..de533379 100644
--- a/materialious/electron/package.json
+++ b/materialious/electron/package.json
@@ -25,6 +25,7 @@
 		"@capacitor-community/electron": "^5.0.0",
 		"@types/jsdom": "^28.0.1",
 		"bgutils-js": "^3.2.0",
+		"capacitor-nodejs": "https://github.com/hampoelz/capacitor-nodejs/releases/download/v1.0.0-beta.9/capacitor-nodejs.tgz",
 		"chokidar": "~5.0.0",
 		"electron-is-dev": "~2.0.0",
 		"electron-serve": "~3.0.0",
@@ -45,4 +46,4 @@
 		"capacitor",
 		"electron"
 	]
-}
\ No newline at end of file
+}
diff --git a/materialious/electron/src/rt/electron-plugins.js b/materialious/electron/src/rt/electron-plugins.js
index b33b2826..5f312366 100644
--- a/materialious/electron/src/rt/electron-plugins.js
+++ b/materialious/electron/src/rt/electron-plugins.js
@@ -1,4 +1,6 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
+const CapacitorNodejs = require('../../../node_modules/capacitor-nodejs/electron/dist/plugin.js');
 
 module.exports = {
+  CapacitorNodejs,
 }
\ No newline at end of file
diff --git a/materialious/package-lock.json b/materialious/package-lock.json
index 165c2ba6..ff841d0d 100644
--- a/materialious/package-lock.json
+++ b/materialious/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "materialious",
-	"version": "1.16.25",
+	"version": "1.16.26",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "materialious",
-			"version": "1.16.25",
+			"version": "1.16.26",
 			"hasInstallScript": true,
 			"dependencies": {
 				"@capacitor-community/electron": "^5.0.1",
diff --git a/materialious/src/lib/fetchProxy.ts b/materialious/src/lib/fetchProxy.ts
index a2a3c611..3932e6aa 100644
--- a/materialious/src/lib/fetchProxy.ts
+++ b/materialious/src/lib/fetchProxy.ts
@@ -42,9 +42,13 @@ export const fetchProxied = async (
 	const nonProxiedUrl =
 		requestInput instanceof Request ? requestInput.url : requestInput.toString();
 
+	console.log('nonProxiedUrl', nonProxiedUrl);
+
 	if (needsProxying(nonProxiedUrl)) {
 		const proxiedUrl = corsProxyUrl + encodeUrl(nonProxiedUrl);
 
+		console.log('proxiedUrl', proxiedUrl);
+
 		if (requestInput instanceof Request) {
 			requestInput = new Request(proxiedUrl, {
 				method: requestInput.method,
diff --git a/materialious/src/lib/player/manifest.ts b/materialious/src/lib/player/manifest.ts
index ff0358de..868aa1d1 100644
--- a/materialious/src/lib/player/manifest.ts
+++ b/materialious/src/lib/player/manifest.ts
@@ -1,21 +1,8 @@
+import { invidiousInstanceStore } from '$lib/store';
+import { get } from 'svelte/store';
+
 export async function manifestDomainInclusion(manifestUrl: string): Promise<string> {
-	const respIvg = await fetch(manifestUrl, {
-		method: 'GET',
-		headers: {
-			// Required for our custom android backend.
-			__redirect: 'manual'
-		},
-		referrerPolicy: 'no-referrer'
-	});
-
-	if (!respIvg.ok) {
-		throw Error('Unable to make request to Invidious');
-	}
-
-	// If location isn't present, then use base manifest URL.
-	const companionUrl = respIvg.headers.get('location') ?? manifestUrl;
-
-	const respCompanion = await fetch(companionUrl, {
+	const respCompanion = await fetch(manifestUrl, {
 		method: 'GET'
 	});
 
@@ -35,10 +22,7 @@ export async function manifestDomainInclusion(manifestUrl: string): Promise<stri
 		const baseUrlValue = baseUrlElement.textContent;
 
 		if (baseUrlValue && (baseUrlValue.startsWith('/') || !baseUrlValue.includes('://'))) {
-			const companionUrlObj = new URL(companionUrl);
-			const baseDomain = `${companionUrlObj.protocol}//${companionUrlObj.host}`;
-			const resolvedUrl = new URL(baseUrlValue, baseDomain).href;
-			baseUrlElement.textContent = resolvedUrl;
+			baseUrlElement.textContent = new URL(baseUrlValue, get(invidiousInstanceStore) ?? '').href;
 		}
 	}