improve

main.go

@@ -16,7 +16,6 @@ import (
 
 	"github.com/chromedp/cdproto/emulation"
 	"github.com/chromedp/cdproto/network"
-	"github.com/chromedp/cdproto/page"
 	"github.com/chromedp/cdproto/security"
 	"github.com/chromedp/cdproto/target"
 	"github.com/chromedp/chromedp"
@@ -117,6 +116,16 @@ func initGlobalBrowser() {
 		chromedp.Flag("disable-blink-features", "AutomationControlled"),
 		chromedp.Flag("exclude-switches", "enable-automation"),
 		chromedp.Flag("use-fake-codec-for-media-stream", true),
+		
+		chromedp.Flag("disable-gl-drawing-for-tests", true),
+		chromedp.Flag("disable-software-rasterizer", true),
+		chromedp.Flag("disable-canvas-aa", true),
+		chromedp.Flag("disable-2d-canvas-clip-antialiasing", true),
+		chromedp.Flag("disable-2d-canvas-image-chromium", true),
+		chromedp.Flag("disable-gpu-rasterization", true),
+		chromedp.Flag("no-zygote", true),
+		chromedp.Flag("single-process", true),
+		
 		chromedp.Flag("disable-infobars", true),
 		chromedp.Flag("disable-notifications", true),
 		chromedp.Flag("disable-popup-blocking", true),
@@ -125,6 +134,9 @@ func initGlobalBrowser() {
 		chromedp.Flag("no-first-run", true),
 		chromedp.Flag("no-default-browser-check", true),
 		chromedp.Flag("window-size", "1366,768"),
+		
+		chromedp.Flag("lang", "en-US,en"),
+		chromedp.Flag("platform", "Win32"),
 		chromedp.Flag("blink-settings", "primaryHoverType=2,availableHoverTypes=2,primaryPointerType=4,availablePointerTypes=4"),
 	)
 
@@ -183,8 +195,7 @@ func executeHandler(w http.ResponseWriter, r *http.Request) {
 	networkRegistry := make(map[network.RequestID]*SniffedNetworkActivity)
 	var closedRequestIDs []network.RequestID
 
-	forceSniff := req.SniffNetwork || true
-	if forceSniff {
+	if req.SniffNetwork {
 		_ = chromedp.Run(timeoutCtx, network.Enable())
 
 		chromedp.ListenTarget(timeoutCtx, func(ev interface{}) {
@@ -229,56 +240,7 @@ func executeHandler(w http.ResponseWriter, r *http.Request) {
 	_ = chromedp.Run(timeoutCtx, chromedp.ActionFunc(func(ctx context.Context) error {
 		_ = target.SetAutoAttach(true, false).WithFlatten(true).Do(ctx)
 		
-		stealthScript := `
-			Object.defineProperty(navigator, 'webdriver', { get: () => false, configurable: true });
-			Object.defineProperty(navigator, 'languages', { get: () => ['en-US', 'en'], configurable: true });
-			Object.defineProperty(navigator, 'platform', { get: () => 'Win32', configurable: true });
-			Object.defineProperty(navigator, 'hardwareConcurrency', { get: () => 8, configurable: true });
-			Object.defineProperty(navigator, 'deviceMemory', { get: () => 8, configurable: true });
-			Object.defineProperty(navigator, 'maxTouchPoints', { get: () => 0, configurable: true });
-			window.chrome = { runtime: {} };
-			
-			const origToDataURL = HTMLCanvasElement.prototype.toDataURL;
-			HTMLCanvasElement.prototype.toDataURL = function(type) {
-				const ctx = this.getContext('2d');
-				if (ctx) {
-					try {
-						const pixel = ctx.getImageData(0, 0, 1, 1).data;
-						if (pixel[3] !== 0) {
-							ctx.fillStyle = 'rgba(255,255,255,0.001)';
-							ctx.fillRect(0, 0, 1, 1);
-						}
-					} catch (e) {}
-				}
-				return origToDataURL.apply(this, arguments);
-			};
-
-			const patchWebGL = (proto) => {
-				const orig = proto.getParameter;
-				proto.getParameter = function(param) {
-					if (param === 37445) return 'Google Inc. (Intel)';
-					if (param === 37446) return 'ANGLE (Intel, Intel(R) UHD Graphics 620 Direct3D11 vs_5_0 ps_5_0, D3D11)';
-					return orig.call(this, param);
-				};
-			};
-			if (typeof WebGLRenderingContext !== 'undefined') patchWebGL(WebGLRenderingContext.prototype);
-			if (typeof WebGL2RenderingContext !== 'undefined') patchWebGL(WebGL2RenderingContext.prototype);
-
-			const origCreateAnalyser = AudioContext.prototype?.createAnalyser;
-			if (origCreateAnalyser) {
-				AudioContext.prototype.createAnalyser = function() {
-					const analyser = origCreateAnalyser.call(this);
-					const origGetFloatFreq = analyser.getFloatFrequencyData.bind(analyser);
-					analyser.getFloatFrequencyData = function(array) {
-						origGetFloatFreq(array);
-						for (let i = 0; i < array.length; i++) {
-							array[i] += (Math.random() - 0.5) * 0.0001;
-						}
-					};
-					return analyser;
-				};
-			}
-
+		hookScript := `
 			window.__turnstileToken = '';
 			const hookTurnstile = () => {
 				if (!window.turnstile || window.turnstile.__hooked) return;
@@ -301,8 +263,8 @@ func executeHandler(w http.ResponseWriter, r *http.Request) {
 				get()  { return this.__ts; }
 			});
 		`
-		_, err := page.AddScriptToEvaluateOnNewDocument(stealthScript).Do(ctx)
-		return err
+		var tmp interface{}
+		return chromedp.Evaluate(hookScript, &tmp).Do(ctx)
 	}))
 
 	if req.Width > 0 && req.Height > 0 {
@@ -450,7 +412,7 @@ func executeHandler(w http.ResponseWriter, r *http.Request) {
 			var token interface{}
 			harvestScript := `
 				(async () => {
-					for (let i = 0; i < 50; i++) {
+					for (let i = 0; i < 40; i++) {
 						if (window.__turnstileToken && window.__turnstileToken.length > 10) {
 							return window.__turnstileToken;
 						}
@@ -460,7 +422,7 @@ func executeHandler(w http.ResponseWriter, r *http.Request) {
 						if (input && input.value && input.value.length > 10) {
 							return input.value;
 						}
-						await new Promise(r => setTimeout(r, 500));
+						await new Promise(r => setTimeout(r, 700));
 					}
 					return "";
 				})();