update

Author: lindongchen

gui/src-tauri/capabilities/main.json

@@ -3,8 +3,11 @@
   "identifier": "main-capability",
   "description": "Capability for the main window",
   "windows": [
-    "main"
+    "*"
   ],
+	"remote": {
+		"urls": ["http://*","https://*","ipc://*"]
+	},
   "permissions": [
     "path:default",
     "event:default",
@@ -21,6 +24,16 @@
     "webview:allow-internal-toggle-devtools",
     "webview:allow-create-webview",
     "webview:allow-create-webview-window",
+		"webview:allow-internal-toggle-devtools",
+		"webview:allow-print",
+		"webview:allow-reparent",
+		"webview:allow-set-webview-focus",
+		"webview:allow-set-webview-position",
+		"webview:allow-set-webview-size",
+		"webview:allow-set-webview-zoom",
+		"webview:allow-webview-close",
+		"webview:allow-webview-position",
+		"webview:allow-webview-size",
     "process:allow-restart",
     {
       "identifier": "shell:allow-spawn",

gui/src-tauri/src/lib.rs

@@ -11,6 +11,7 @@ use std::any::Any;
 use tauri::AppHandle;
 use url::Url;
 use tauri::Manager;
+use tauri_plugin_shell::ShellExt;
 
 #[command]
 fn pipylib(lib: String, argv: Vec<String>, argc: i32) -> Result<String, String> {
@@ -93,6 +94,17 @@ async fn create_proxy_webview(
 	window_label: String,
 	proxy_url: String,
 	curl: String,
+) -> Result<(),()> {
+	create_proxy_webview_core(app.clone(), label.to_string(), window_label.to_string(), proxy_url.to_string(), curl);
+	Ok(())
+}
+
+fn create_proxy_webview_core(
+	app: tauri::AppHandle,
+	label: String,
+	window_label: String,
+	proxy_url: String,
+	curl: String,
 ) -> Result<(),()> {
 	unsafe {
 
@@ -110,18 +122,27 @@ async fn create_proxy_webview(
 			    );
 			options.proxy_url = proxy_url_ops
 		}
-		
-		let mut builder = tauri::WebviewBuilder::from_config(&options);
-		
+		println!("builder!");
+
+		let builder = tauri::WebviewBuilder::from_config(&options).on_navigation(|url| {
+		    // allow the production URL or localhost on dev
+			println!("on_navigation!");
+			if url.scheme() == "http" || url.scheme() == "https" || url.scheme() == "ipc" {
+				println!("{}",url);
+				// create_proxy_webview_core(app, url.to_string(), url.to_string(), proxy_url.to_string(), url.to_string());
+			}
+			true
+		});
     let window = app
         .get_window(&window_label)
         .expect("Failed to find window by label");
 
-		window.add_child(
+		let webview = window.add_child(
 			builder,
 			tauri::LogicalPosition::new(0, 0),
-			tauri::LogicalSize::new(960, 800),
+			window.inner_size().unwrap(),
 		).unwrap();
+		
 	}
 	Ok(())
 }

gui/src-tauri/tauri.conf.json

@@ -21,6 +21,18 @@
       }
     ],
     "security": {
+      "csp": {
+        "default-src": "'self' customprotocol: asset:",
+        "connect-src": "ipc://localhost ipc://localhost/plugin:shell|open",
+        "img-src": "'self' asset: http://asset.localhost blob: data:",
+        "style-src": "'unsafe-inline' 'self' https://fonts.googleapis.com"
+      },
+			"assetProtocol": {
+				"enable": false,
+				"scope": []
+			},
+			"dangerousDisableAssetCspModification": false,
+			"freezePrototype": false,
       "capabilities": ["main-capability"]
     },
 		"withGlobalTauri": true

gui/src/layout/Apps.vue

@@ -80,7 +80,7 @@ const openWebview = (app)=>{
 			getCurrentDL().then((urls)=>{
 				console.log(urls)
 			})
-		}	else if(platform.value=='windows'){
+		}	else if(platform.value=='windows' || true){
 			// windows API not available on mobile
 			options.parent = getCurrent();