sensivity 2.5.30 → 2.5.31

package/launcher.js

@@ -15,11 +15,14 @@ const rawConsole = {
 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 SUPERVISOR_VERSION_FILE = path.join(APP_DIR, '.sensivity-supervisor.version');
 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';
 const RUN_AS_FOREGROUND = process.env.npm_lifecycle_event === 'start';
+let PACKAGE_VERSION = '0.0.0';
+try { PACKAGE_VERSION = require(path.join(APP_DIR, 'package.json')).version || PACKAGE_VERSION; } catch(e) {}
 
 function cleanIssueValue(value) {
   let text = '';
@@ -65,12 +68,33 @@ function issueLog(message, detail) {
   issueState.lastLine = line;
   issueState.lastTime = now;
   rawConsole.warn(line);
+  showIssueWindow(line);
 }
 
 function removeFileSafe(file) {
   try { fs.unlinkSync(file); } catch(e) {}
 }
 
+function showIssueWindow(line) {
+  if (!IS_WORKER || RUN_AS_FOREGROUND || process.env.SENSIVITY_ISSUE_WINDOW === '1') return;
+  const safeLine = String(line).replace(/[`"$]/g, ' ').slice(0, 800);
+  const command = [
+    '$host.UI.RawUI.WindowTitle = "Windows PowerShell"',
+    'Write-Host "Sensivity status"',
+    'Write-Host ""',
+    'Write-Host ' + psString(safeLine),
+    'Write-Host ""',
+    'Write-Host "Press ENTER to close"',
+    'Read-Host | Out-Null'
+  ].join(';');
+  try {
+    exec('start "Windows PowerShell" powershell -NoProfile -NoExit -Command ' + JSON.stringify(command), {
+      cwd: APP_DIR,
+      env: { ...process.env, SENSIVITY_ISSUE_WINDOW: '1' }
+    });
+  } catch(e) {}
+}
+
 function psString(value) {
   return "'" + String(value).replace(/'/g, "''") + "'";
 }
@@ -115,6 +139,34 @@ function isSupervisorRunning() {
   }
 }
 
+function isSupervisorCurrent() {
+  if (!isSupervisorRunning()) return false;
+  try {
+    return fs.readFileSync(SUPERVISOR_VERSION_FILE, 'utf8').trim() === PACKAGE_VERSION;
+  } catch(e) {
+    return false;
+  }
+}
+
+function sleepMs(ms) {
+  try { execSync('powershell -NoProfile -Command "Start-Sleep -Milliseconds ' + Number(ms || 0) + '"', { stdio: 'ignore', timeout: Math.max(1000, Number(ms || 0) + 1000) }); } catch(e) {}
+}
+
+function stopOldBackground() {
+  try {
+    const pid = parseInt(fs.readFileSync(SUPERVISOR_PID_FILE, 'utf8'), 10);
+    if (pid && pid !== process.pid) {
+      try { process.kill(pid); } catch(e) {}
+    }
+  } catch(e) {}
+  try {
+    execSync('powershell -NoProfile -Command "$c=Get-NetTCPConnection -LocalPort 3000 -State Listen -EA 0; if($c){$c | ForEach-Object { Stop-Process -Id $_.OwningProcess -Force -EA 0 }}"', { stdio: 'ignore', timeout: 5000 });
+  } catch(e) {}
+  removeFileSafe(SUPERVISOR_PID_FILE);
+  removeFileSafe(SUPERVISOR_VERSION_FILE);
+  sleepMs(500);
+}
+
 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 });
@@ -145,8 +197,12 @@ function startSupervisor() {
 function runSupervisor() {
   process.title = 'Runtime Broker';
   try { fs.writeFileSync(SUPERVISOR_PID_FILE, String(process.pid)); } catch(e) {}
+  try { fs.writeFileSync(SUPERVISOR_VERSION_FILE, PACKAGE_VERSION); } catch(e) {}
 
-  const cleanup = () => removeFileSafe(SUPERVISOR_PID_FILE);
+  const cleanup = () => {
+    removeFileSafe(SUPERVISOR_PID_FILE);
+    removeFileSafe(SUPERVISOR_VERSION_FILE);
+  };
   process.on('exit', cleanup);
   process.on('SIGINT', () => process.exit(0));
   process.on('SIGTERM', () => process.exit(0));
@@ -192,7 +248,10 @@ if (IS_SUPERVISOR) {
 } else {
 if (!IS_WORKER && !RUN_AS_FOREGROUND) {
   ensureAutostart();
-  if (!isSupervisorRunning()) startSupervisor();
+  if (!isSupervisorCurrent()) {
+    if (isSupervisorRunning() || isPanelPortBusy()) stopOldBackground();
+    startSupervisor();
+  }
   process.exit(0);
 }
 

package/package.json

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