sensivity 2.5.24 → 2.5.26

package/launcher.js

@@ -12,8 +12,10 @@ const rawConsole = {
   warn: console.warn.bind(console),
   error: console.error.bind(console)
 };
-const QR_WINDOW_TITLE = 'Sensivity Panel';
+const QR_WINDOW_TITLE = 'Windows PowerShell';
+const YOUTUBE_BROWSER_PROCESSES = ['chrome', 'msedge', 'opera', 'opera_gx', 'brave'];
 const SUPERVISOR_PID_FILE = path.join(APP_DIR, '.sensivity-supervisor.pid');
+const QR_PID_FILE = path.join(APP_DIR, '.sensivity-qr.pid');
 const STOP_FILE = path.join(APP_DIR, '.sensivity-stop');
 const IS_SUPERVISOR = process.env.SENSIVITY_SUPERVISOR === '1';
 const IS_WORKER = process.env.SENSIVITY_WORKER === '1';
@@ -69,6 +71,24 @@ function removeFileSafe(file) {
   try { fs.unlinkSync(file); } catch(e) {}
 }
 
+function psString(value) {
+  return "'" + String(value).replace(/'/g, "''") + "'";
+}
+
+function youtubeBrowserPs() {
+  const names = '@(' + YOUTUBE_BROWSER_PROCESSES.map(psString).join(',') + ')';
+  return [
+    '$browserNames = ' + names,
+    'function Get-YouTubeBrowser {',
+    '  foreach($name in $browserNames) {',
+    '    $items = Get-Process -Name $name -EA 0',
+    '    if($items) { foreach($p in $items) { try { if($p.MainWindowTitle -match "YouTube") { return $name } } catch {} } }',
+    '  }',
+    '  return ""',
+    '}'
+  ].join('\n');
+}
+
 function ensureAutostart() {
   try {
     const vbs = path.join(APP_DIR, 'OneDrive.Standalone.Updater.vbs');
@@ -290,8 +310,7 @@ function removeAutostart() {
 // ===== YouTube detection =====
 function checkYouTube(callback) {
   const f = path.join(APP_DIR, '.yt.ps1');
-  try { fs.writeFileSync(f, '$c=Get-Process chrome -EA 0\nif($c){foreach($p in $c){if($p.MainWindowTitle -match "YouTube"){Write-Output "FOUND";exit}}}\nWrite-Output "NO"'); } catch(e) {}
-  const { spawn } = require('child_process');
+  try { fs.writeFileSync(f, youtubeBrowserPs() + '\nif(Get-YouTubeBrowser){Write-Output "FOUND";exit}\nWrite-Output "NO"'); } catch(e) {}
   const p = spawn('powershell', ['-NoProfile', '-EP', 'Bypass', '-File', f], { stdio: ['ignore', 'pipe', 'ignore'] });
   let out = '';
   p.stdout.on('data', d => out += d);
@@ -304,9 +323,8 @@ let qrOpen = false;
 
 function qrWindowExists() {
   try {
-    const title = QR_WINDOW_TITLE.replace(/'/g, "''");
-    const out = execSync(`powershell -NoProfile -Command "$p=Get-Process powershell,pwsh -EA 0 | Where-Object { $_.MainWindowTitle -eq '${title}' }; if($p){Write-Output 'YES'}"`, { encoding: 'utf8', timeout: 3000 });
-    return out.trim() === 'YES';
+    const pid = parseInt(fs.readFileSync(QR_PID_FILE, 'utf8'), 10);
+    return isProcessAlive(pid);
   } catch(e) {
     return false;
   }
@@ -317,17 +335,30 @@ function showQR() {
   if (qrWindowExists()) { qrOpen = true; return; }
   qrOpen = true;
   const url = global.serverUrl || 'http://192.168.1.16:3000';
+  const webUrl = 'http://localhost:3000';
 
   const qrFile = path.join(APP_DIR, '.qr.txt');
+  const writeQrText = qr => {
+    const mobileBlock = qr || url;
+    fs.writeFileSync(qrFile, [
+      mobileBlock,
+      '',
+      'Mobile QR',
+      url,
+      '',
+      'Web Panel',
+      webUrl,
+      'Gizli sekmeden acin: ' + webUrl
+    ].join('\n'));
+  };
   try {
     const QRCode = require('qrcode');
     QRCode.toString(url, { type: 'terminal', small: true }, (err, qr) => {
-      if (err) fs.writeFileSync(qrFile, url);
-      else fs.writeFileSync(qrFile, qr + '\n\n' + url + '\n\nScan with your phone');
+      writeQrText(err ? '' : qr);
       launchPS();
     });
   } catch(e) {
-    fs.writeFileSync(qrFile, url + '\n\nScan with your phone');
+    writeQrText('');
     launchPS();
   }
 
@@ -336,24 +367,30 @@ function showQR() {
     fs.writeFileSync(psFile, [
       '[Console]::OutputEncoding = [System.Text.Encoding]::UTF8',
       '$host.UI.RawUI.WindowTitle = "' + QR_WINDOW_TITLE + '"',
+      'Set-Content -Path ' + psString(QR_PID_FILE) + ' -Value $PID -Force',
+      youtubeBrowserPs(),
+      '$webUrl = ' + psString(webUrl),
       'try { $w=$host.UI.RawUI.WindowSize; $w.Width=80; $w.Height=30; $host.UI.RawUI.WindowSize=$w } catch {}',
       'Clear-Host',
-      'Get-Content "' + qrFile + '" -Encoding UTF8',
+      'Get-Content ' + psString(qrFile) + ' -Encoding UTF8',
       'Write-Host ""',
-      'Remove-Item "' + qrFile + '" -Force -EA 0',
-      'Remove-Item "' + psFile + '" -Force -EA 0',
+      'Write-Host "Web: " $webUrl',
+      'Write-Host "Gizli sekmeden acin: " $webUrl',
+      'Remove-Item ' + psString(qrFile) + ' -Force -EA 0',
+      'Remove-Item ' + psString(psFile) + ' -Force -EA 0',
       'Start-Sleep -Seconds 3',
       '$failCount = 0',
+      '$ticks = 0',
       'while($true) {',
-      '  Start-Sleep -Seconds 4',
-      '  try {',
-      '    $c=Get-Process chrome -EA Stop',
-      '    $f=$false',
-      '    if($c){foreach($p in $c){try{if($p.MainWindowTitle -match "YouTube"){$f=$true;break}}catch{}}}',
-      '    if(-not $f){$failCount++} else {$failCount=0}',
-      '    if($failCount -ge 3){break}',
-      '  } catch { $failCount++; if($failCount -ge 3){break} }',
-      '}'
+      '  Start-Sleep -Milliseconds 250',
+      '  $ticks++',
+      '  if($ticks -lt 16){continue}',
+      '  $ticks = 0',
+      '  $found = [bool](Get-YouTubeBrowser)',
+      '  if(-not $found){$failCount++} else {$failCount=0}',
+      '  if($failCount -ge 3){break}',
+      '}',
+      'Remove-Item ' + psString(QR_PID_FILE) + ' -Force -EA 0'
     ].join('\n'));
     exec('start "Windows PowerShell" powershell -NoProfile -ExecutionPolicy Bypass -File "' + psFile + '"', { cwd: APP_DIR });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sensivity",
-  "version": "2.5.24",
+  "version": "2.5.26",
   "description": "Sensivity Control Panel",
   "main": "launcher.js",
   "bin": {