Update server.js

server.js

@@ -1,84 +1,46 @@
-// server.js
-const express=require('express');const {v4:uuidv4}=require('uuid');const {createWorker,PSM}=require('tesseract.js');const genericPool=require('generic-pool');const path=require('path');const sharp=require('sharp');
-const app=express();const port=process.env.PORT||7860;app.use(express.json({limit:'5mb'}));
-const cs={};const CEX=5*60*1000;const OCS="ACEFHJKMNPRTUVWXY23469";const OCL=6;
-const WCC=[{n:"r",rgb:[1,0,0]},{n:"g",rgb:[0,1,0]},{n:"b",rgb:[0,0,1]},{n:"y",rgb:[1,1,0]}];const XK="KluchevoyeSlovoDlyaDemo";
-const TPL=4;let tp=null;let pDO=false;
-const fac={create:async()=>{const w=await createWorker('eng',1,{langPath:path.join(__dirname,'tessdata'),gzip:true,cacheMethod:'none'});await w.setParameters({tessedit_char_whitelist:OCS,tessedit_pageseg_mode:PSM.SINGLE_WORD});return w;},destroy:async(w)=>{await w.terminate();}};
-const pO={min:TPL,max:TPL,acquireTimeoutMillis:7000};
-async function iTP(){try{tp=genericPool.createPool(fac,pO);console.log(`Pool(s:${TPL})OK`);const ws=await Promise.all(Array(TPL).fill(null).map(()=>tp.acquire()));ws.forEach(w=>tp.release(w));console.log(`${TPL}wOK`);}catch(e){console.error("PoolInitFail:",e);process.exit(1);}}
-iTP();
-async function pIFOCR(b){try{return await sharp(b).grayscale().normalize().sharpen({sigma:0.5,m1:0,m2:3,x1:0,y2:3,y3:3}).toBuffer();}catch(e){console.warn("PreProcFail:",e.message.slice(0,50));return b;}}
-async function rWPW(b,h){if(!tp){console.error("PoolNA!");return null;}let w=null;try{w=await tp.acquire();const pB=await pIFOCR(b);const{data:{text}}=await w.recognize(pB);return text.trim().replace(new RegExp(`[^${OCS}]`,'g'),'');}catch(e){console.error(`OCR ${h} Err:`,e.message.slice(0,50));return null;}finally{if(w)await tp.release(w);}}
-async function pSO(d){if(!d||!d.startsWith('data:image/png;base64,'))return{fT:null,aL:[]};const bD=d.replace(/^data:image\/png;base64,/,"");const iB=Buffer.from(bD,'base64');let rs=[];let aL=[];
-    if(!pDO&&tp&&tp.available>=2){pDO=true;try{const[r1,r2]=await Promise.all([rWPW(iB,"D1"),rWPW(iB,"D2")]);rs.push(r1,r2);aL.push({t:"D1",x:r1},{t:"D2",x:r2});}catch(e){console.error("DualOCRErr:",e);}finally{pDO=false;}}
-    else if(tp&&tp.available>=1){try{const rS=await rWPW(iB,"S1");rs.push(rS);aL.push({t:"S1",x:rS});}catch(e){console.error("SingleOCRErr:",e);}}
-    else{console.warn("NoWForOCR");aL.push({t:"N",x:null,r:"NoW"});}
-    const vR=rs.filter(t=>t!==null&&t!=="");const fT=vR.length>0?vR[0]:null;console.log(`OCRLog: ${aL.map(a=>`${a.t}:${a.x||'-'}`).join('; ')}. Fin:"${fT||'-'}"`);return{fT,aL};}
-function ld(a,b){if(!a&&!b)return 0;if(!a)return b.length;if(!b)return a.length;const m=[];for(let i=0;i<=b.length;i++)m[i]=[i];for(let j=0;j<=a.length;j++)m[0][j]=j;for(let i=1;i<=b.length;i++){for(let j=1;j<=a.length;j++){if(b.charAt(i-1)===a.charAt(j-1))m[i][j]=m[i-1][j-1];else m[i][j]=Math.min(m[i-1][j-1]+1,Math.min(m[i][j-1]+1,m[i-1][j]+1));}}return m[b.length][a.length];}
-function xS(t,k){let r="";for(let i=0;i<t.length;i++)r+=String.fromCharCode(t.charCodeAt(i)^k.charCodeAt(i%k.length));return r;}
-function dF(d){try{const x=atob(d);const o=xS(x,XK);return JSON.parse(o);}catch(e){console.error("DecErr:",e.message.slice(0,50));return null;}}
-app.use((req,res,next)=>{res.header('Access-Control-Allow-Origin','*');res.header('Access-Control-Allow-Headers','Origin,X-Requested-With,Content-Type,Accept');res.header('Access-Control-Allow-Methods','GET,POST,OPTIONS');if(req.method==='OPTIONS')return res.sendStatus(200);next();});
-app.get('/api/challenge',(req,res)=>{const sT=uuidv4();let oCT="";for(let i=0;i<OCL;i++)oCT+=OCS[Math.floor(Math.random()*OCS.length)];const wI=WCC[Math.floor(Math.random()*WCC.length)];cs[sT]={iat:Date.now(),exp:Date.now()+CEX,usd:false,ip:req.ip,eOT:oCT,eWCN:wI.n,eWCR:wI.rgb};res.json({sT,oCT,wCC:wI.rgb});});
-
-app.post('/api/check', async (req, res) => {
-    const p=req.body; let sc=0; const stgs=[]; let mF=false;
-    const sT=p.sT; const oCDU=p.oCDU; const dD=p.eD?dF(p.eD):null;
-    let s0P=false; if(dD){s0P=true;sc+=10;}else{mF=true;} stgs.push({n:"E0",p:s0P,pts:s0P?10:-100});
-    const wR=dD?.wgl; const nI=dD?.nav; const pT=dD?.perf; const aV=dD?.aut;
-    let sV=false; let sDet=null; let s1P=false;
-    if(!mF){if(!sT||!cs[sT]||cs[sT].usd||Date.now()>cs[sT].exp){mF=true;}else{sDet=cs[sT];sV=true;s1P=true;sc+=30;}}
-    stgs.push({n:"E1",p:s1P,pts:s1P?30:(mF&&!s0P?0:-100)});
-
-    let ocrPassed=false; let ocrPts=0;
-    if(!mF){
-        if(!oCDU||!oCDU.startsWith('data:image/png;base64,')||oCDU.length<150){ocrPts=-80;mF=true;}
-        else{const oRes=await pSO(oCDU); const rT=oRes.fT; const eT=sDet.eOT;
-            if(rT!==null){const dist=ld(rT,eT);if(dist<=1){ocrPassed=true;ocrPts=40+(dist===0?5:0);}else{ocrPts=-80;mF=true;}}
-            else{ocrPts=-70;mF=true;}}
-        if(!ocrPassed&&!mF){if(Math.random()<0.10){ocrPassed=true;ocrPts=5;stgs.push({n:"E2",p:true,pts:ocrPts,note:"RND"});}else{mF=true;if(!stgs.find(s=>s.n==="E2"))stgs.push({n:"E2",p:false,pts:ocrPts});}}
-        if(ocrPassed&&!stgs.find(s=>s.n==="E2")){stgs.push({n:"E2",p:true,pts:ocrPts});}
-        else if(!ocrPassed&&!stgs.find(s=>s.n==="E2")){stgs.push({n:"E2",p:false,pts:ocrPts});}
-        sc+=ocrPts;
-    }else{stgs.push({n:"E2",p:false,pts:0});}
-
-    let webglPassed=false; let webglPts=0;
-    if(sV&&wR){const eR=sDet.eWCR;const eP=[Math.round(eR[0]*255),Math.round(eR[1]*255),Math.round(eR[2]*255)];
-        if(wR.px&&wR.px.length>=3){const cP=wR.px.slice(0,3);if(cP.every((v,i)=>Math.abs(v-eP[i])<=8)){webglPassed=true;webglPts=70;}else{webglPts=-10;}}else{webglPts=-5;}
-        const rdr=wR.rdr?.toLowerCase()||"";if(rdr.includes("swiftshader")||rdr.includes("llvmpipe")){webglPts-=20;webglPassed=false;}}else if(wR?.err){webglPts=-5;}
-    sc+=webglPts;stgs.push({n:"E3",p:webglPassed,pts:webglPts});
-
-    let navPassed=true; let navPts=0;
-    if(nI){if(nI.wd===true){navPts-=30;navPassed=false;}if(!nI.ua||nI.ua===""){navPts-=10;navPassed=false;}else if(nI.ua.toLowerCase().includes("bot")||nI.ua.toLowerCase().includes("headless")){if(!nI.ua.toLowerCase().includes("headlesschrome")){navPts-=20;navPassed=false;}}}else{navPts-=5;navPassed=false;}
-    sc+=navPts;stgs.push({n:"E4",p:navPassed,pts:navPts});
-
-    let perfPassed=true; let perfPts=0;
-    if(pT&&sV){const{dct,ocrt,wrt}=pT;if(typeof dct==='number'&&dct<10){perfPts-=10;perfPassed=false;}if(typeof ocrt==='number'&&ocrt<3&&oCDU){perfPts-=10;perfPassed=false;}if(typeof wrt==='number'&&wrt<3&&wR?.px){perfPts-=10;perfPassed=false;}}else if(!pT){perfPts-=3;perfPassed=false;}
-    sc+=perfPts;stgs.push({n:"E5",p:perfPassed,pts:perfPts});
-
-    let autoPassed=true; let autoPts=0;
-    if(aV&&Object.keys(aV).length>0){autoPts-=40;autoPassed=false;}else{autoPts+=5;}
-    sc+=autoPts;stgs.push({n:"E6",p:autoPassed,pts:autoPts});
-    
-    sc=Math.max(0,Math.min(sc,150));
-    let vT="";
-
-    if(mF){vT="Блокировать (Критический провал)";}
-    else {
-        const primaryConditionMet = ocrPassed || webglPassed;
-        const secondaryConditionMet = navPassed || perfPassed || autoPassed;
-        if(primaryConditionMet && secondaryConditionMet){
-            vT="Разрешено";
-            if(sDet)sDet.usd=true;
-        } else {
-            vT="Блокировать (Не пройдены условия)";
-        }
-    }
-    console.log(`[${new Date().toISOString().slice(0,19).replace('T',' ')}] Chk: T=${sT||'N/A'},S=${sc},V=${vT},IP=${req.ip},MF=${mF},OCR=${ocrPassed},WebGL=${webglPassed},Nav=${navPassed},Perf=${perfPassed},Auto=${autoPassed}`);
-    res.json({vT,fS:sc,cS:stgs});
-});
-
-setInterval(()=>{const n=Date.now();for(const t in cs){if(cs[t].exp<n||(cs[t].usd&&(n-cs[t].iat>CEX*2))){delete cs[t];}}},60000);
-async function shutdown(){console.log("Shutdown...");if(tp){console.log("Draining pool...");await tp.drain().then(()=>tp.clear()).then(()=>console.log("Pool cleared.")).catch(e=>console.error("Pool drain err:",e));}process.exit(0);}
-process.on('SIGTERM',shutdown);process.on('SIGINT',shutdown);
-app.listen(port,()=>{console.log(`RuleV3 API on ${port}`);});
+<!DOCTYPE html>
+<html lang="ru">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Автоматическая Проверка Системы</title>
+    <style>
+        body { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif; margin: 20px; line-height: 1.6; color: #333; background-color: #f4f7f6; display: flex; flex-direction: column; align-items: center; justify-content: center; min-height: 90vh; }
+        .container { background-color: white; padding: 25px; border-radius: 8px; box-shadow: 0 2px 10px rgba(0,0,0,0.1); text-align: center; max-width: 500px; width: 90%;}
+        h1 { color: #2c3e50; margin-bottom: 20px; font-size: 1.8em; }
+        #status-message { margin-top: 15px; padding: 12px; border-radius: 6px; font-size: 1.1em; font-weight: bold; }
+        .status-loading { background-color: #e8f0fe; color: #2980b9; border: 1px solid #a9c9f8; }
+        .status-success { background-color: #e6f4ea; color: #34a853; border: 1px solid #a3d3ab; }
+        .status-error { background-color: #fce8e6; color: #ea4335; border: 1px solid #f7b9b3; }
+        #check-details { list-style-type: none; padding: 0; margin-top: 20px; text-align: left; }
+        #check-details li { border-bottom: 1px solid #eee; padding: 10px 0; }
+        #check-details li:last-child { border-bottom: none; }
+        #spinner { border: 4px solid rgba(0,0,0,0.1); width: 36px; height: 36px; border-radius: 50%; border-left-color: #09f; animation: spin 1s ease infinite; margin: 25px auto; display: block; }
+        @keyframes spin { 0% { transform: rotate(0deg); } 100% { transform: rotate(360deg); } }
+        .final-score { margin-top:15px; font-size: 1.1em; font-weight: 500; }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <h1>Проверка Системы</h1>
+        <div id="spinner"></div>
+        <div id="status-message" style="display:none;"></div>
+        <ul id="check-details"></ul>
+        <div id="finalScoreDisplay" class="final-score" style="display:none;"></div>
+    </div>
+
+    <script>
+        const sm=document.getElementById('status-message');const cd=document.getElementById('check-details');const sp=document.getElementById('spinner');const fsd=document.getElementById('finalScoreDisplay');
+        const ABU='https://wallegriffkinder-browsercheck.hf.space';const CE=`${ABU}/api/challenge`;const CHE=`${ABU}/api/check`;
+        const XK="KluchevoyeSlovoDlyaDemo";
+        function xS(t,k){let r="";for(let i=0;i<t.length;i++)r+=String.fromCharCode(t.charCodeAt(i)^k.charCodeAt(i%k.length));return r;}
+        function eF(d){if(typeof d!=='string')d=JSON.stringify(d);return btoa(xS(d,XK));}
+        async function gcp(){const r=await fetch(CE);if(!r.ok)throw new Error(`ChErr:${r.status}`);const d=await r.json();if(!d.sT||!d.oCT||!d.wCC)throw new Error('ChInc.');return d;}
+        function dOC(oT){const c=document.createElement('canvas');c.width=200;c.height=50;const ctx=c.getContext('2d');ctx.fillStyle="#FFF";ctx.fillRect(0,0,c.width,c.height);ctx.fillStyle="#000";ctx.font="28px monospace";ctx.textBaseline='middle';ctx.textAlign='center';ctx.fillText(oT,c.width/2,c.height/2);for(let i=0;i<2;i++){ctx.beginPath();ctx.moveTo(Math.random()*c.width,Math.random()*c.height);ctx.lineTo(Math.random()*c.width,Math.random()*c.height);ctx.strokeStyle=`rgba(${Math.floor(Math.random()*150)},${Math.floor(Math.random()*150)},${Math.floor(Math.random()*150)},0.4)`;ctx.lineWidth=Math.random()*1+0.5;ctx.stroke();}return c.toDataURL('image/png');}
+        function pWC(cc){const res={rdr:"N/A",vnd:"N/A",px:null,err:null};const c=document.createElement('canvas');c.width=10;c.height=10;try{const gl=c.getContext('webgl',{premultipliedAlpha:false,preserveDrawingBuffer:true})||c.getContext('experimental-webgl',{premultipliedAlpha:false,preserveDrawingBuffer:true});if(!gl){res.err="NoGL";return res;}res.rdr=gl.getParameter(gl.RENDERER)||"N/A";res.vnd=gl.getParameter(gl.VENDOR)||"N/A";const vsSrc=`attribute vec2 p;void main(){gl_Position=vec4(p,0,1);}`;const fsSrc=`precision lowp float;uniform vec3 c;void main(){gl_FragColor=vec4(c,1);}`;const vs=gl.createShader(gl.VERTEX_SHADER);gl.shaderSource(vs,vsSrc);gl.compileShader(vs);const fs=gl.createShader(gl.FRAGMENT_SHADER);gl.shaderSource(fs,fsSrc);gl.compileShader(fs);const prg=gl.createProgram();gl.attachShader(prg,vs);gl.attachShader(prg,fs);gl.linkProgram(prg);gl.useProgram(prg);const pos=[-0.95,-0.95,0.95,-0.95,0.0,0.95];const pbuf=gl.createBuffer();gl.bindBuffer(gl.ARRAY_BUFFER,pbuf);gl.bufferData(gl.ARRAY_BUFFER,new Float32Array(pos),gl.STATIC_DRAW);const paLoc=gl.getAttribLocation(prg,"p");gl.enableVertexAttribArray(paLoc);gl.vertexAttribPointer(paLoc,2,gl.FLOAT,false,0,0);const cuLoc=gl.getUniformLocation(prg,"c");gl.uniform3fv(cuLoc,cc);gl.clearColor(0,0,0,0);gl.clear(gl.COLOR_BUFFER_BIT);gl.drawArrays(gl.TRIANGLES,0,3);const pxd=new Uint8Array(4);gl.readPixels(Math.floor(c.width/2),Math.floor(c.height/2),1,1,gl.RGBA,gl.UNSIGNED_BYTE,pxd);res.px=Array.from(pxd);if(gl.getError()!==gl.NO_ERROR)res.err=`GLOpErr`;}catch(e){res.err=e.message.slice(0,30);}return res;}
+        async function cAD(sT,oCT,wCC){const tS=performance.now();const r={};r.jse=true;const tO_s=performance.now();const oCDU=dOC(oCT);const tO_e=performance.now();const tW_s=performance.now();r.wgl=pWC(wCC);const tW_e=performance.now();r.nav={wd:navigator.webdriver,ua:navigator.userAgent.slice(0,150),pl:navigator.platform,lg:navigator.languages?navigator.languages[0]:navigator.language,hc:navigator.hardwareConcurrency,mtp:navigator.maxTouchPoints||0,ce:navigator.cookieEnabled,};if(screen){r.scr={w:screen.width,h:screen.height,aw:screen.availWidth,ah:screen.availHeight,cd:screen.colorDepth};if(screen.orientation)r.scr.ot=screen.orientation.type;}r.dpr=window.devicePixelRatio;r.isc=window.isSecureContext;r.aut={};['_s','$c','__wde','cs'].forEach(vP=>{for(const k in window){if(k.toLowerCase().includes(vP)){r.aut[k.slice(0,10)]=true;break;}}});const tE=performance.now();r.perf={dct:Math.round(tE-tS),ocrt:Math.round(tO_e-tO_s),wrt:Math.round(tW_e-tW_s),ts:Date.now()%1000000,};return{sT:sT,oCDU:oCDU,eD:eF(r)};}
+        async function rAC(){sp.style.display='block';sm.style.display='block';sm.className='status-loading';cd.innerHTML='';fsd.style.display='none';try{sm.textContent='Инициализация...';const cP=await gcp();sm.textContent=`Обработка...`;const bDTS=await cAD(cP.sT,cP.oCT,cP.wCC);sm.textContent=`Отправка...`;const rp=await fetch(CHE,{method:'POST',headers:{'Content-Type':'application/json',},body:JSON.stringify(bDTS),});sp.style.display='none';if(!rp.ok){let eB='';try{eB=await rp.text();}catch(e){}throw new Error(`ServErr:${rp.status}.${eB.slice(0,50)}`);}const rs=await rp.json();sm.className=rs.vT.includes("Разрешено")?'status-success':'status-error';sm.innerHTML=`Результат:<strong>${rs.vT||'N/A'}</strong>`;if(rs.cS&&Array.isArray(rs.cS)){rs.cS.forEach(stg=>{const li=document.createElement('li');li.textContent=`${stg.n} ${stg.p?'✅':'❌'} (${stg.pts} очков)`;cd.appendChild(li);});}if(rs.fS!==undefined){fsd.textContent=`Итог: ${rs.fS}`;fsd.style.display='block';}}catch(e){console.error('ChkErr:',e);sp.style.display='none';sm.className='status-error';sm.textContent=`Ошибка:${e.message}`;}}
+        window.addEventListener('load',rAC);
+    </script>
+</body>
+</html>