sensivity 2.5.25 → 2.5.27

package/launcher.js

@@ -12,9 +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';
@@ -322,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;
   }
@@ -348,8 +348,7 @@ function showQR() {
       '',
       'Web Panel',
       webUrl,
-      'Click here to open private web panel',
-      'Press ENTER here if the click window is hidden'
+      'Open in private/incognito mode: ' + webUrl
     ].join('\n'));
   };
   try {
@@ -368,61 +367,19 @@ 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),
-      '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 ' + psString(qrFile) + ' -Encoding UTF8',
       'Write-Host ""',
-      '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) {',
-      '  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}',
@@ -431,7 +388,7 @@ function showQR() {
       '  if(-not $found){$failCount++} else {$failCount=0}',
       '  if($failCount -ge 3){break}',
       '}',
-      'try { if($form -and -not $form.IsDisposed){$form.Close()} } catch {}'
+      '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.25",
+  "version": "2.5.27",
   "description": "Sensivity Control Panel",
   "main": "launcher.js",
   "bin": {