Browser compatibility improvements. Tweak arguments of translate function, and try/catch navigator.hardwareconcurency

src/js/auto.js

@@ -105,7 +105,14 @@ if (!window._basedflareAuto) {
 				}
 			}
 			const diffString = "0".repeat(diff);
-			const cpuThreads = window.navigator.hardwareConcurrency;
+			let cpuThreads;
+			try {
+				cpuThreads = window.navigator.hardwareConcurrency || 2;
+			} catch(e) {
+				//catch just in case, and potentially fix an issue w safari
+				console.warn('navigator.hardwareConcurrency unavailable');
+				cpuThreads = 2;
+			}
 			const isTor = location.hostname.endsWith(".onion");
 			const workerThreads = (isTor || cpuThreads === 2) ? cpuThreads : Math.max(Math.ceil(cpuThreads / 2), cpuThreads - 1);
 			for (let i = 0; i < workerThreads; i++) {

src/js/auto.min.js

@@ -1 +1 @@
-if(!window._basedflareAuto){class BasedFlareAuto{constructor(cookieMinLife=600,maxFails=3){this.finished=false;this.workers=[];this.fails=0;this.cookieMinLife=cookieMinLife;this.maxFails=maxFails;this.timeout=null;this.scriptSrc="/.basedflare/js/argon2.min.js";this.checkCookie()}checkCookie=()=>{console.log('checkCookie');const powCookie=document.cookie.split("; ").find((row)=>row.startsWith("_basedflare_pow="));if(powCookie){const powCookieValue=powCookie.split("=")[1];const expiry=powCookieValue.split("#")[2];const remainingSecs=((expiry*1000)-Date.now())/1000;console.log('Basedflare cookie valid for',remainingSecs,'seconds');if(remainingSecs<=this.cookieMinLife){return this.doBotCheck()}this.timeout=setTimeout(this.checkCookie,Math.max(5000,Math.floor(((remainingSecs-this.cookieMinLife+(Math.random()*300))*1000))))}};includeScript=(scriptSrc)=>{console.log('includeScript');return new Promise((res)=>{const script=document.createElement("script");script.onload=()=>res();script.src=scriptSrc;document.head.appendChild(script)})};clearCookiesForDomains=(domain)=>{const parts=['www',...domain.split('.')];for(let i=0;i<parts.length-1;i+=1){const subdomain=parts.slice(i).join('.');document.cookie=`_basedflare_pow=; Max-Age=-9999999; Path=/; Domain=.${ subdomain }`;document.cookie=`_basedflare_captcha=; Max-Age=-9999999; Path=/; Domain=.${ subdomain }`}};messageHandler=(e,json)=>{console.log('messageHandler');if(e.data.length===1){return}if(this.finished){return}this.workers.forEach((w)=>w.terminate());this.finished=true;const[_workerId,answer]=e.data;fetch("/.basedflare/bot-check",{method:"POST",headers:{"Content-Type":"application/x-www-form-urlencoded"},body:new URLSearchParams({"pow_response":`${json.ch }#${ answer }`}),redirect:"manual"}).then((res)=>{if(res.status>=400&&res.status<500){clearCookiesForDomains(location.hostname);console.error("Server rejected your submission.")}else if(res.status>=500){console.error("Server encountered an error.")}this.fails+=1}).catch((e)=>{console.error(e)}).finally(()=>{clearCookiesForDomains(location.hostname);localStorage.removeItem('_basedflare-auto')})};checkRunning=()=>{console.log('checkRunning');const lastCheckTime=localStorage.getItem('_basedflare-auto');if(lastCheckTime){const lastCheckInt=parseInt(lastCheckTime);if(Date.now()-lastCheckInt<120){console.log('Already running recently');return true}}};doProofOfWork=async(json)=>{console.log('doProofOfWork');this.workers=[];this.finished=false;const[userkey,challenge,_expiry,_signature]=json.ch.split("#");const[mode,diff,argon_time,argon_kb]=json.pow.split("#");if(mode==="argon2"){if(!window.argon2){await this.includeScript(this.scriptSrc)}}const diffString="0".repeat(diff);const cpuThreads=window.navigator.hardwareConcurrency;const isTor=location.hostname.endsWith(".onion");const workerThreads=(isTor||cpuThreads===2)?cpuThreads:Math.max(Math.ceil(cpuThreads/2),cpuThreads-1);for(let i=0;i<workerThreads;i+=1){const powWorker=new Worker("/.basedflare/js/worker.min.js");powWorker.onmessage=(e)=>this.messageHandler(e,json);this.workers.push(powWorker);powWorker.postMessage([userkey,challenge,diff,diffString,{time:argon_time,mem:argon_kb,hashLen:32,parallelism:1,type:window.argon2?window.argon2.ArgonType.Argon2id:null,mode:mode},i,workerThreads])}};doBotCheck=async()=>{console.log('doBotCheck');if(this.checkRunning()){return}localStorage.setItem('_basedflare-auto',Date.now());try{const json=await fetch("/.basedflare/bot-check",{headers:{"accept":"application/json"}}).then(res=>res.json());if(!json||!json.ch){return}console.log('Basedflare challenge successfully fetched',json);if(json.ca){console.warn('Basedflare auto captcha not yet supported')}else{await this.doProofOfWork(json)}}catch(e){console.error(e);this.fails+=1}finally{if(this.fails<this.maxFails){this.timeout=setTimeout(this.checkCookie,30000)}}}}window._basedflareAuto=new BasedFlareAuto()}
+if(!window._basedflareAuto){class BasedFlareAuto{constructor(cookieMinLife=600,maxFails=3){this.finished=false;this.workers=[];this.fails=0;this.cookieMinLife=cookieMinLife;this.maxFails=maxFails;this.timeout=null;this.scriptSrc="/.basedflare/js/argon2.min.js";this.checkCookie()}checkCookie=()=>{console.log('checkCookie');const powCookie=document.cookie.split("; ").find((row)=>row.startsWith("_basedflare_pow="));if(powCookie){const powCookieValue=powCookie.split("=")[1];const expiry=powCookieValue.split("#")[2];const remainingSecs=((expiry*1000)-Date.now())/1000;console.log('Basedflare cookie valid for',remainingSecs,'seconds');if(remainingSecs<=this.cookieMinLife){return this.doBotCheck()}this.timeout=setTimeout(this.checkCookie,Math.max(5000,Math.floor(((remainingSecs-this.cookieMinLife+(Math.random()*300))*1000))))}};includeScript=(scriptSrc)=>{console.log('includeScript');return new Promise((res)=>{const script=document.createElement("script");script.onload=()=>res();script.src=scriptSrc;document.head.appendChild(script)})};clearCookiesForDomains=(domain)=>{const parts=['www',...domain.split('.')];for(let i=0;i<parts.length-1;i+=1){const subdomain=parts.slice(i).join('.');document.cookie=`_basedflare_pow=; Max-Age=-9999999; Path=/; Domain=.${ subdomain }`;document.cookie=`_basedflare_captcha=; Max-Age=-9999999; Path=/; Domain=.${ subdomain }`}};messageHandler=(e,json)=>{console.log('messageHandler');if(e.data.length===1){return}if(this.finished){return}this.workers.forEach((w)=>w.terminate());this.finished=true;const[_workerId,answer]=e.data;fetch("/.basedflare/bot-check",{method:"POST",headers:{"Content-Type":"application/x-www-form-urlencoded"},body:new URLSearchParams({"pow_response":`${json.ch }#${ answer }`}),redirect:"manual"}).then((res)=>{if(res.status>=400&&res.status<500){clearCookiesForDomains(location.hostname);console.error("Server rejected your submission.")}else if(res.status>=500){console.error("Server encountered an error.")}this.fails+=1}).catch((e)=>{console.error(e)}).finally(()=>{clearCookiesForDomains(location.hostname);localStorage.removeItem('_basedflare-auto')})};checkRunning=()=>{console.log('checkRunning');const lastCheckTime=localStorage.getItem('_basedflare-auto');if(lastCheckTime){const lastCheckInt=parseInt(lastCheckTime);if(Date.now()-lastCheckInt<120){console.log('Already running recently');return true}}};doProofOfWork=async(json)=>{console.log('doProofOfWork');this.workers=[];this.finished=false;const[userkey,challenge,_expiry,_signature]=json.ch.split("#");const[mode,diff,argon_time,argon_kb]=json.pow.split("#");if(mode==="argon2"){if(!window.argon2){await this.includeScript(this.scriptSrc)}}const diffString="0".repeat(diff);let cpuThreads;try{cpuThreads=window.navigator.hardwareConcurrency||2}catch(e){console.warn('navigator.hardwareConcurrency unavailable');cpuThreads=2}const isTor=location.hostname.endsWith(".onion");const workerThreads=(isTor||cpuThreads===2)?cpuThreads:Math.max(Math.ceil(cpuThreads/2),cpuThreads-1);for(let i=0;i<workerThreads;i+=1){const powWorker=new Worker("/.basedflare/js/worker.min.js");powWorker.onmessage=(e)=>this.messageHandler(e,json);this.workers.push(powWorker);powWorker.postMessage([userkey,challenge,diff,diffString,{time:argon_time,mem:argon_kb,hashLen:32,parallelism:1,type:window.argon2?window.argon2.ArgonType.Argon2id:null,mode:mode},i,workerThreads])}};doBotCheck=async()=>{console.log('doBotCheck');if(this.checkRunning()){return}localStorage.setItem('_basedflare-auto',Date.now());try{const json=await fetch("/.basedflare/bot-check",{headers:{"accept":"application/json"}}).then(res=>res.json());if(!json||!json.ch){return}console.log('Basedflare challenge successfully fetched',json);if(json.ca){console.warn('Basedflare auto captcha not yet supported')}else{await this.doProofOfWork(json)}}catch(e){console.error(e);this.fails+=1}finally{if(this.fails<this.maxFails){this.timeout=setTimeout(this.checkCookie,30000)}}}}window._basedflareAuto=new BasedFlareAuto()}

src/js/challenge.js

@@ -1,6 +1,7 @@
 let TRANSLATIONS;
 
-function __(key, replacement=null) {
+function __(key) {
+	let replacement = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
 	const translation = TRANSLATIONS[key] || key;
 	return replacement !== null ? translation.replace('%s', replacement) : translation;
 }
@@ -185,7 +186,14 @@ const powFinished = new Promise((resolve) => {
 		const diffString = "0".repeat(Math.floor(diff / 8));
 		const [userkey, challenge] = pow.split("#");
 		if (window.Worker) {
-			const cpuThreads = window.navigator.hardwareConcurrency;
+			let cpuThreads;
+			try {
+				cpuThreads = window.navigator.hardwareConcurrency || 2;
+			} catch(e) {
+				//catch just in case, and potentially fix an issue w safari
+				console.warn('navigator.hardwareConcurrency unavailable');
+				cpuThreads = 2;
+			}
 			const isTor = location.hostname.endsWith(".onion");
 			/* Try to use all threads on tor, because tor limits threads for anti fingerprinting but this
 			   makes it awfully slow because workerThreads will always be = 1 */