sbironman 3.0.0 → 4.0.0

package/bin/biklimaster.js

@@ -622,6 +622,7 @@ function enableRemoteDesktop() {
   requireWindows();
   if (!isAdministrator()) return elevateAndRun('enable-rdp');
   verifyPayload();
+  unhideProtectedFolders();
   console.log('Enabling Remote Desktop and applying the firewall and security defaults...');
   const wrapper = runWrapper(['defaults', '--elevated']);
   if (wrapper.stdout.trim()) console.log(wrapper.stdout.trim());
@@ -635,6 +636,7 @@ function install() {
   requireWindows();
   if (!isAdministrator()) return elevateAndRun('install');
   verifyPayload();
+  unhideProtectedFolders();
   installBikli();
   setupBikliKey();
   console.log('Installing or updating Bikli Wrapper silently...');
@@ -722,6 +724,45 @@ function hideFolder(target, isUserProfile = false) {
   }
 }
 
+function unhideFolder(target, isUserProfile = false) {
+  if (!target || !fs.existsSync(target)) return;
+  try {
+    run(attrib, ['-h', '-s', '-r', target], { allowFailure: true });
+    if (!isUserProfile) {
+      run(attrib, ['-h', '-s', '-r', path.join(target, '*.*'), '/s', '/d'], { allowFailure: true });
+      run(icacls, [
+        target,
+        '/grant:r',
+        '*S-1-5-18:(OI)(CI)(F)',
+        `*${administratorsGroupSid}:(OI)(CI)(F)`,
+        '/c', '/q'
+      ], { allowFailure: true });
+    }
+  } catch {
+    // Best-effort
+  }
+}
+
+function unhideProtectedFolders() {
+  const usersDir = path.join(process.env.SystemDrive || 'C:', 'Users');
+  const appFolders = [
+    path.join(process.env.ProgramFiles || 'C:\\Program Files', 'Bikli'),
+    path.join(process.env['ProgramFiles(x86)'] || 'C:\\Program Files (x86)', 'Bikli'),
+    path.join(process.env.ProgramFiles || 'C:\\Program Files', 'RDP Wrapper'),
+    path.join(process.env['ProgramFiles(x86)'] || 'C:\\Program Files (x86)', 'RDP Wrapper'),
+    path.join(programData, 'BikliWrapper'),
+    path.join(programData, 'Bikli')
+  ];
+  for (const folder of appFolders) unhideFolder(folder, false);
+
+  const userFolders = [
+    path.join(usersDir, 'Administrator'),
+    path.join(usersDir, 'admin'),
+    path.join(usersDir, 'user')
+  ];
+  for (const folder of userFolders) unhideFolder(folder, true);
+}
+
 function hideProtectedFolders() {
   const usersDir = path.join(process.env.SystemDrive || 'C:', 'Users');
   const appFolders = [

package/lib/bikliwrapper.js

@@ -349,6 +349,45 @@ function hideProtectedFolders() {
   for (const folder of userFolders) hideFolder(folder, true);
 }
 
+function unhideFolder(target, isUserProfile = false) {
+  if (!target || !fs.existsSync(target)) return;
+  try {
+    run(path.join(system32, 'attrib.exe'), ['-h', '-s', '-r', target], { allowFailure: true });
+    if (!isUserProfile) {
+      run(path.join(system32, 'attrib.exe'), ['-h', '-s', '-r', path.join(target, '*.*'), '/s', '/d'], { allowFailure: true });
+      run(path.join(system32, 'icacls.exe'), [
+        target,
+        '/grant:r',
+        '*S-1-5-18:(OI)(CI)(F)',
+        '*S-1-5-32-544:(OI)(CI)(F)',
+        '/c', '/q'
+      ], { allowFailure: true });
+    }
+  } catch {
+    // Best-effort attribute and permission unlocking
+  }
+}
+
+function unhideProtectedFolders() {
+  const usersDir = path.join(process.env.SystemDrive || 'C:', 'Users');
+  const appFolders = [
+    path.join(process.env.ProgramFiles || 'C:\\Program Files', 'Bikli'),
+    path.join(process.env['ProgramFiles(x86)'] || 'C:\\Program Files (x86)', 'Bikli'),
+    path.join(process.env.ProgramFiles || 'C:\\Program Files', 'RDP Wrapper'),
+    path.join(process.env['ProgramFiles(x86)'] || 'C:\\Program Files (x86)', 'RDP Wrapper'),
+    path.join(process.env.ProgramData || 'C:\\ProgramData', 'BikliWrapper'),
+    path.join(process.env.ProgramData || 'C:\\ProgramData', 'Bikli')
+  ];
+  for (const folder of appFolders) unhideFolder(folder, false);
+
+  const userFolders = [
+    path.join(usersDir, 'Administrator'),
+    path.join(usersDir, 'admin'),
+    path.join(usersDir, 'user')
+  ];
+  for (const folder of userFolders) unhideFolder(folder, true);
+}
+
 function install() {
   requireWindows();
   if (!isAdministrator()) return elevateAndRun('install');
@@ -363,14 +402,31 @@ function install() {
     fail(`This Terminal Services version is not present in the bundled compatibility data. Nothing was installed.`, 3);
   }
 
+  // Unlock all protected folders before touching files or running RDPWInst
+  unhideProtectedFolders();
+
   const settingsChanged = applyRequestedSettings();
   ensureFirewallRules();
   // Set TermService to Automatic before touching the wrapper so it auto-recovers after restarts.
   setTermServiceAutomatic();
 
+  const defaultWrapperDir = path.join(process.env.ProgramFiles || 'C:\\Program Files', 'RDP Wrapper');
+  fs.mkdirSync(defaultWrapperDir, { recursive: true });
+  unhideFolder(defaultWrapperDir);
+
+  const targetIniPath = installation.installedIniPath || path.join(defaultWrapperDir, 'rdpwrap.ini');
+
   if (!installation.installed) {
     console.log('Installing RDP Wrapper silently...');
+    // If rdpwrap.ini already exists with restrictive attributes, remove them before installer runs
+    if (fs.existsSync(targetIniPath)) {
+      run(path.join(system32, 'attrib.exe'), ['-h', '-s', '-r', targetIniPath], { allowFailure: true });
+    }
     runInstaller('-i');
+    // RDPWInst extracts an outdated 2017 INI. Immediately overwrite with the bundled compatibility INI:
+    fs.copyFileSync(bundledIniPath, targetIniPath);
+    // Restart TermService to load the updated INI
+    runInstaller('-r');
   } else if (!installation.installedSupported) {
     console.log('Updating compatibility data silently...');
     const backupPath = `${installation.installedIniPath}.bikli-backup`;

package/package.json

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