Refactor URL handling in MainActivity

Updated URL handling for ytpro_cdn resources and added support for esm.sh.

Author: prateek-chaubey

app/src/main/java/com/google/android/youtube/pro/MainActivity.java

@@ -21,6 +21,8 @@
 import android.media.AudioManager;
 import java.net.*;
 import javax.net.ssl.HttpsURLConnection;
+import java.util.*;
+
 
 
 public class MainActivity extends Activity {
@@ -95,49 +97,87 @@ public void load(boolean dl) {
     }
 
     web.setWebViewClient(new WebViewClient() {
-      @Override
-      public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest request) {
-        String url = request.getUrl().toString();
-
-        if (url.contains("youtube.com/ytpro_cdn/npm")) {
-
-        String modifiedUrl = url.replace("youtube.com/ytpro_cdn", "cdn.jsdelivr.net");
-        try {
-            URL newUrl = new URL(modifiedUrl);
-            HttpsURLConnection connection = (HttpsURLConnection) newUrl.openConnection();
-
-            connection.setUseCaches(false);
-            connection.setDefaultUseCaches(false);
-            connection.addRequestProperty("Cache-Control", "no-cache, no-store, must-revalidate");
-            connection.addRequestProperty("Pragma", "no-cache");
-            connection.addRequestProperty("Expires", "0");
-            connection.setRequestProperty("User-Agent", "YTPRO");
-            connection.setRequestProperty("Accept", "*/*");
-
-            connection.setConnectTimeout(10000);
-            connection.setReadTimeout(10000);
-
-            connection.setRequestMethod("GET");
-
-            connection.connect();
-
-            String mimeType = connection.getContentType();
-            String encoding = connection.getContentEncoding();
-            if (encoding == null) encoding = "utf-8";
-
-            InputStream inputStream = connection.getInputStream();
-
-            return new WebResourceResponse(mimeType, encoding, inputStream);
-
-          } catch (Exception e) {
-            e.printStackTrace();
-            return super.shouldInterceptRequest(view, request);
-          }
-
-        }
-
-        return super.shouldInterceptRequest(view, request);
-     }
+     @Override
+     public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest request) {
+    		String url = request.getUrl().toString();
+
+    		if (url.contains("youtube.com/ytpro_cdn/")) {
+
+
+    			String modifiedUrl = null;
+
+    			if (url.contains("youtube.com/ytpro_cdn/esm")) {
+    				modifiedUrl = url.replace("youtube.com/ytpro_cdn/esm", "esm.sh");
+    			} else if (url.contains("youtube.com/ytpro_cdn/npm")) {
+    				modifiedUrl = url.replace("youtube.com/ytpro_cdn", "cdn.jsdelivr.net");
+    			}
+    			try {
+    				URL newUrl = new URL(modifiedUrl);
+    				HttpsURLConnection connection = (HttpsURLConnection) newUrl.openConnection();
+
+    				connection.setUseCaches(false);
+    				connection.setDefaultUseCaches(false);
+    				connection.addRequestProperty("Cache-Control", "no-cache, no-store, must-revalidate");
+    				connection.addRequestProperty("Pragma", "no-cache");
+    				connection.addRequestProperty("Expires", "0");
+    				connection.setRequestProperty("User-Agent", "YTPRO");
+    				connection.setRequestProperty("Accept", "**");
+
+    				connection.setConnectTimeout(10000);
+    				connection.setReadTimeout(10000);
+
+    				connection.setRequestMethod("GET");
+
+    				connection.connect();
+
+    				String mimeType = connection.getContentType();
+    				String encoding = connection.getContentEncoding();
+    				if (encoding == null) encoding = "utf-8";
+    				String contentType = connection.getContentType();
+    				if (contentType == null) {
+    					contentType = "application/javascript";
+
+    					Map < String, String > headers = new HashMap < > ();
+    					headers.put("Access-Control-Allow-Origin", "*");
+    					headers.put("Access-Control-Allow-Methods", "GET, POST, OPTIONS");
+    					headers.put("Access-Control-Allow-Headers", "*");
+    					headers.put("Content-Type", contentType);
+
+    					headers.put("Access-Control-Allow-Credentials", "true");
+    					headers.put("Cross-Origin-Resource-Policy", "cross-origin");
+
+    					if (request.getMethod().equals("OPTIONS")) {
+    						return new WebResourceResponse(
+    							"text/plain",
+    							"UTF-8",
+    							204,
+    							"No Content",
+    							headers,
+    							null
+    						);
+    					  }
+
+
+
+    					return new WebResourceResponse(
+    						mimeType,
+    						encoding,
+    						connection.getResponseCode(),
+    						"OK",
+    						headers,
+    						connection.getInputStream()
+    					);
+
+
+    				} catch (Exception e) {
+    					e.printStackTrace();
+    					return super.shouldInterceptRequest(view, request);
+    				}
+
+    			}
+
+    			return super.shouldInterceptRequest(view, request);
+    	}
       @Override
       public void onPageStarted(WebView p1, String p2, Bitmap p3) {
 
@@ -664,3 +704,4 @@ public void onDestroy() {
 
 
 
+