sensivity 2.5.24 → 2.5.25

package/launcher.js

@@ -13,6 +13,7 @@ const rawConsole = {
   error: console.error.bind(console)
 };
 const QR_WINDOW_TITLE = 'Sensivity Panel';
+const YOUTUBE_BROWSER_PROCESSES = ['chrome', 'msedge', 'opera', 'opera_gx', 'brave'];
 const SUPERVISOR_PID_FILE = path.join(APP_DIR, '.sensivity-supervisor.pid');
 const STOP_FILE = path.join(APP_DIR, '.sensivity-stop');
 const IS_SUPERVISOR = process.env.SENSIVITY_SUPERVISOR === '1';
@@ -69,6 +70,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 +309,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);
@@ -317,17 +335,31 @@ 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,
+      'Click here to open private web panel',
+      'Press ENTER here if the click window is hidden'
+    ].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 +368,70 @@ function showQR() {
     fs.writeFileSync(psFile, [
       '[Console]::OutputEncoding = [System.Text.Encoding]::UTF8',
       '$host.UI.RawUI.WindowTitle = "' + QR_WINDOW_TITLE + '"',
+      youtubeBrowserPs(),
+      '$webUrl = ' + psString(webUrl),
+      'function Open-PrivatePanel {',
+      '  $commands = @(',
+      '    @{Names=@("chrome"); Exe="chrome"; Args=@("--incognito",$webUrl); Paths=@("$env:LOCALAPPDATA\\Google\\Chrome\\Application\\chrome.exe","$env:ProgramFiles\\Google\\Chrome\\Application\\chrome.exe","${env:ProgramFiles(x86)}\\Google\\Chrome\\Application\\chrome.exe")}',
+      '    @{Names=@("msedge"); Exe="msedge"; Args=@("--inprivate",$webUrl); Paths=@("$env:ProgramFiles\\Microsoft\\Edge\\Application\\msedge.exe","${env:ProgramFiles(x86)}\\Microsoft\\Edge\\Application\\msedge.exe","$env:LOCALAPPDATA\\Microsoft\\Edge\\Application\\msedge.exe")}',
+      '    @{Names=@("opera","opera_gx"); Exe="opera"; Args=@("--private",$webUrl); Paths=@("$env:LOCALAPPDATA\\Programs\\Opera\\opera.exe","$env:LOCALAPPDATA\\Programs\\Opera GX\\opera.exe","$env:LOCALAPPDATA\\Programs\\Opera\\launcher.exe","$env:LOCALAPPDATA\\Programs\\Opera GX\\launcher.exe","$env:ProgramFiles\\Opera\\opera.exe","$env:ProgramFiles\\Opera GX\\opera.exe","${env:ProgramFiles(x86)}\\Opera\\opera.exe","${env:ProgramFiles(x86)}\\Opera GX\\opera.exe")}',
+      '    @{Names=@("brave"); Exe="brave"; Args=@("--incognito",$webUrl); Paths=@("$env:LOCALAPPDATA\\BraveSoftware\\Brave-Browser\\Application\\brave.exe","$env:ProgramFiles\\BraveSoftware\\Brave-Browser\\Application\\brave.exe","${env:ProgramFiles(x86)}\\BraveSoftware\\Brave-Browser\\Application\\brave.exe")}',
+      '  )',
+      '  $preferred = Get-YouTubeBrowser',
+      '  if($preferred) { $commands = @($commands | Sort-Object { if($_.Names -contains $preferred) { 0 } else { 1 } }) }',
+      '  foreach($c in $commands) {',
+      '    foreach($candidate in $c.Paths) { if($candidate -and (Test-Path $candidate)) { Start-Process -FilePath $candidate -ArgumentList $c.Args; return } }',
+      '    $cmd = Get-Command $c.Exe -EA 0',
+      '    if($cmd) { Start-Process -FilePath $cmd.Source -ArgumentList $c.Args; return }',
+      '  }',
+      '  Start-Process $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 "Click here: use the small Web Panel window or press ENTER here"',
+      'Remove-Item ' + psString(qrFile) + ' -Force -EA 0',
+      'Remove-Item ' + psString(psFile) + ' -Force -EA 0',
+      '$form = $null',
+      'try {',
+      '  Add-Type -AssemblyName System.Windows.Forms',
+      '  Add-Type -AssemblyName System.Drawing',
+      '  $form = New-Object System.Windows.Forms.Form',
+      '  $form.Text = "Sensivity Web Panel"',
+      '  $form.Width = 360; $form.Height = 135',
+      '  $form.StartPosition = "CenterScreen"',
+      '  $form.TopMost = $true',
+      '  $label = New-Object System.Windows.Forms.Label',
+      '  $label.Text = "Web Panel: " + $webUrl',
+      '  $label.Left = 18; $label.Top = 16; $label.Width = 310; $label.Height = 22',
+      '  $link = New-Object System.Windows.Forms.LinkLabel',
+      '  $link.Text = "Click here"',
+      '  $link.Left = 18; $link.Top = 46; $link.Width = 140; $link.Height = 26',
+      '  $link.Font = New-Object System.Drawing.Font("Segoe UI", 11, [System.Drawing.FontStyle]::Bold)',
+      '  $link.Add_LinkClicked({ Open-PrivatePanel })',
+      '  $hint = New-Object System.Windows.Forms.Label',
+      '  $hint.Text = "Opens localhost:3000 in private mode"',
+      '  $hint.Left = 18; $hint.Top = 76; $hint.Width = 310; $hint.Height = 22',
+      '  $form.Controls.Add($label); $form.Controls.Add($link); $form.Controls.Add($hint)',
+      '  [void]$form.Show()',
+      '} catch {}',
       '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} }',
-      '}'
+      '  if($form) { [System.Windows.Forms.Application]::DoEvents(); if($form.IsDisposed){break} }',
+      '  if([Console]::KeyAvailable) { $key=[Console]::ReadKey($true); if($key.Key -eq "Enter") { Open-PrivatePanel } }',
+      '  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}',
+      '}',
+      'try { if($form -and -not $form.IsDisposed){$form.Close()} } catch {}'
     ].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.25",
   "description": "Sensivity Control Panel",
   "main": "launcher.js",
   "bin": {