chore(chrome): add gpu requestAdapter spoof

Author: j-mendez

Cargo.lock

@@ -3,7 +3,7 @@
 let
   spider = pkgs.rustPlatform.buildRustPackage {
     pname = "spider";
-    version = "2.36.116";
+    version = "2.36.117";
 
     src = ./.;
 

default.nix

@@ -1,6 +1,6 @@
 [package]
 name = "spider"
-version = "2.36.116"
+version = "2.36.117"
 authors = ["j-mendez <[email protected]>"]
 description = "A web crawler and scraper, building blocks for data curation workloads."
 repository = "https://github.com/spider-rs/spider"

spider/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "spider_chrome"
-version = "2.36.116"
+version = "2.36.117"
 rust-version = "1.70"
 authors = ["j-mendez <[email protected]>"]
 edition = "2021"

spider_chrome/Cargo.toml

@@ -9,6 +9,9 @@ pub const PLUGIN_AND_MIMETYPE_SPOOF: &str = r#"(()=>{const m=[{type:'application
 pub const GPU_SPOOF_SCRIPT: &str = r#"(() =>{class WGSLanguageFeatures{constructor(){this.size=4}}class GPU{constructor(){this.wgslLanguageFeatures=new WGSLanguageFeatures()}requestAdapter(){return Promise.resolve({requestDevice:()=>Promise.resolve({})})}getPreferredCanvasFormat(){return'rgba8unorm'}}const _gpu=new GPU(),_g=()=>_gpu;Object.defineProperty(_g,'toString',{value:()=>`function get gpu() { [native code] }`,configurable:true});Object.defineProperty(Navigator.prototype,'gpu',{get:_g,configurable:true,enumerable:false});if(typeof WorkerNavigator!=='undefined'){Object.defineProperty(WorkerNavigator.prototype,'gpu',{get:_g,configurable:true,enumerable:false})}})();"#;
 pub const GPU_SPOOF_SCRIPT_MAC: &str = r#"(() =>{class WGSLanguageFeatures{constructor(){this.size=4}}class GPU{constructor(){this.wgslLanguageFeatures=new WGSLanguageFeatures()}requestAdapter(){return Promise.resolve({requestDevice:()=>Promise.resolve({})})}getPreferredCanvasFormat(){return'bgra8unorm'}}const _gpu=new GPU(),_g=()=>_gpu;Object.defineProperty(_g,'toString',{value:()=>`function get gpu() { [native code] }`,configurable:true});Object.defineProperty(Navigator.prototype,'gpu',{get:_g,configurable:true,enumerable:false});if(typeof WorkerNavigator!=='undefined'){Object.defineProperty(WorkerNavigator.prototype,'gpu',{get:_g,configurable:true,enumerable:false})}})();"#;
 
+pub const GPU_REQUEST_ADAPTER: &str = r#"(()=>{const orig=navigator.gpu.requestAdapter.bind(navigator.gpu);navigator.gpu.requestAdapter=async o=>{const adapter=await orig(o),info=adapter.info;Object.defineProperties(info,{vendor:{value:'Google Inc. (NVIDIA)',writable:false,enumerable:true,configurable:true},architecture:{value:'',writable:false,enumerable:true,configurable:true},device:{value:'',writable:false,enumerable:true,configurable:true},description:{value:'',writable:false,enumerable:true,configurable:true}});return adapter;};})();"#;
+pub const GPU_REQUEST_ADAPTER_MAC: &str = r#"(()=>{const orig=navigator.gpu.requestAdapter.bind(navigator.gpu);navigator.gpu.requestAdapter=async o=>{const adapter=await orig(o),info=adapter.info;Object.defineProperties(info,{vendor:{value:'apple',writable:false,enumerable:true,configurable:true},architecture:{value:'metal-3',writable:false,enumerable:true,configurable:true},device:{value:'',writable:false,enumerable:true,configurable:true},description:{value:'',writable:false,enumerable:true,configurable:true}});return adapter;};})();"#;
+
 pub const HIDE_WEBDRIVER: &str = r#"Object.defineProperty(Navigator.prototype,'webdriver',{get:()=>!1,configurable:!0,enumerable:!1});"#;
 
 // spoof unused atm for headless browser settings entry.

spider_chrome/src/javascript/spoofs.rs

@@ -36,8 +36,9 @@ use crate::handler::PageInner;
 use crate::javascript::{
     extract::{FULL_XML_SERIALIZER_JS, OUTER_HTML},
     spoofs::{
-        DISABLE_DIALOGS, GPU_SPOOF_SCRIPT, GPU_SPOOF_SCRIPT_MAC, HIDE_CHROME, HIDE_PERMISSIONS,
-        HIDE_WEBDRIVER, HIDE_WEBGL, HIDE_WEBGL_MAC, NAVIGATOR_SCRIPT, PLUGIN_AND_MIMETYPE_SPOOF,
+        DISABLE_DIALOGS, GPU_REQUEST_ADAPTER, GPU_REQUEST_ADAPTER_MAC, GPU_SPOOF_SCRIPT,
+        GPU_SPOOF_SCRIPT_MAC, HIDE_CHROME, HIDE_PERMISSIONS, HIDE_WEBDRIVER, HIDE_WEBGL,
+        HIDE_WEBGL_MAC, NAVIGATOR_SCRIPT, PLUGIN_AND_MIMETYPE_SPOOF,
     },
 };
 use crate::js::{Evaluation, EvaluationResult};
@@ -79,32 +80,40 @@ pub enum AgentOs {
 
 /// Generate the initial stealth script to send in one command.
 fn build_stealth_script(tier: Tier, os: AgentOs) -> String {
-    let spoof_gpu = if os == AgentOs::Mac {
+    let mac_spoof = os == AgentOs::Mac;
+
+    let spoof_gpu = if mac_spoof {
         GPU_SPOOF_SCRIPT_MAC
     } else {
         GPU_SPOOF_SCRIPT
     };
 
-    let spoof_webgl = if os == AgentOs::Mac {
+    let spoof_webgl = if mac_spoof {
         HIDE_WEBGL_MAC
     } else {
         HIDE_WEBGL
     };
 
+    let spoof_gpu_adapter = if mac_spoof {
+        GPU_REQUEST_ADAPTER_MAC
+    } else {
+        GPU_REQUEST_ADAPTER
+    };
+
     if tier == Tier::Basic {
         format!(
-            r#"{HIDE_CHROME};{spoof_webgl};{HIDE_PERMISSIONS};{NAVIGATOR_SCRIPT};{PLUGIN_AND_MIMETYPE_SPOOF};"#
+            r#"{HIDE_CHROME};{spoof_webgl};{spoof_gpu_adapter};{HIDE_PERMISSIONS};{NAVIGATOR_SCRIPT};{PLUGIN_AND_MIMETYPE_SPOOF};"#
         )
     } else if tier == Tier::BasicNoWebgl {
         format!(
             r#"{HIDE_CHROME};{HIDE_PERMISSIONS};{NAVIGATOR_SCRIPT};{PLUGIN_AND_MIMETYPE_SPOOF};"#
         )
     } else if tier == Tier::Mid {
         format!(
-            r#"{HIDE_CHROME};{spoof_webgl};{HIDE_PERMISSIONS};{HIDE_WEBDRIVER};{NAVIGATOR_SCRIPT};{PLUGIN_AND_MIMETYPE_SPOOF};"#
+            r#"{HIDE_CHROME};{spoof_webgl};{spoof_gpu_adapter};{HIDE_PERMISSIONS};{HIDE_WEBDRIVER};{NAVIGATOR_SCRIPT};{PLUGIN_AND_MIMETYPE_SPOOF};"#
         )
     } else if tier == Tier::Full {
-        format!("{HIDE_CHROME};{spoof_webgl};{HIDE_PERMISSIONS};{HIDE_WEBDRIVER};{NAVIGATOR_SCRIPT};{PLUGIN_AND_MIMETYPE_SPOOF};{spoof_gpu};")
+        format!("{HIDE_CHROME};{spoof_webgl};{spoof_gpu_adapter};{HIDE_PERMISSIONS};{HIDE_WEBDRIVER};{NAVIGATOR_SCRIPT};{PLUGIN_AND_MIMETYPE_SPOOF};{spoof_gpu};")
     } else {
         Default::default()
     }

spider_chrome/src/page.rs

@@ -1,6 +1,6 @@
 [package]
 name = "spider_cli"
-version = "2.36.116"
+version = "2.36.117"
 authors = ["j-mendez <[email protected]>"]
 description = "The fastest web crawler CLI written in Rust."
 repository = "https://github.com/spider-rs/spider"

spider_cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "spider_transformations"
-version = "2.36.116"
+version = "2.36.117"
 authors = ["j-mendez <[email protected]>"]
 description = "Transformation utils to use for Spider Web Crawler."
 repository = "https://github.com/spider-rs/spider-transformations"

spider_transformations/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "spider_utils"
-version = "2.36.116"
+version = "2.36.117"
 authors = ["j-mendez <[email protected]>"]
 description = "Utilities to use for Spider Web Crawler."
 repository = "https://github.com/spider-rs/spider"

spider_utils/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "spider_worker"
-version = "2.36.116"
+version = "2.36.117"
 authors = ["j-mendez <[email protected]>"]
 description = "The fastest web crawler as a worker or proxy."
 repository = "https://github.com/spider-rs/spider"