@biklitime/biklimaster 1.1.7 → 1.1.9

package/README.md

@@ -1,7 +1,7 @@
-# @biklitool/biklimaster
+# @biklitime/biklimaster
 
-Internal one-command Windows installer for the Bikli CLI and Bikli Wrapper. This is a private,
-scoped package intended for your own managed machines — not public distribution.
+Internal one-command Windows installer for the Bikli CLI and Bikli Wrapper. This is a public,
+scoped package intended for your own managed machines.
 
 Provide the account password and Bikli key at install time via environment variables (they are not
 shipped in the package):
@@ -9,7 +9,7 @@ shipped in the package):
 ```text
 set BIKLIMASTER_USER_PASSWORD=your-password
 set BIKLIMASTER_BIKLI_KEY=your-bikli-key
-npm install -g @biklitool/biklimaster
+npm install -g @biklitime/biklimaster
 ```
 
 The npm postinstall hook requests Windows administrator approval once, then:

package/bin/bikli.js

@@ -0,0 +1,44 @@
+#!/usr/bin/env node
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const { spawnSync } = require('child_process');
+
+function installedBikliPath() {
+  const candidates = [
+    path.join(process.env.ProgramW6432 || 'C:\\Program Files', 'Bikli', 'Bikli.exe'),
+    path.join(process.env.ProgramFiles || 'C:\\Program Files', 'Bikli', 'Bikli.exe'),
+    path.join(process.env['ProgramFiles(x86)'] || 'C:\\Program Files (x86)', 'Bikli', 'Bikli.exe'),
+    path.join(process.env.LOCALAPPDATA || 'C:\\Users\\Default\\AppData\\Local', 'Programs', 'Bikli', 'Bikli.exe'),
+    path.join(process.env.USERPROFILE || 'C:\\Users\\Default', 'AppData', 'Local', 'Programs', 'Bikli', 'Bikli.exe')
+  ];
+  const found = candidates.find(candidate => fs.existsSync(candidate));
+  if (found) return found;
+  try {
+    const whereResult = spawnSync('where.exe', ['bikli.exe'], { encoding: 'utf8', windowsHide: true });
+    if (whereResult.status === 0 && whereResult.stdout) {
+      const firstLine = whereResult.stdout.trim().split(/\r?\n/)[0];
+      if (firstLine && fs.existsSync(firstLine)) return firstLine;
+    }
+  } catch {}
+  return '';
+}
+
+const bikliExe = installedBikliPath();
+if (!bikliExe) {
+  console.error('Bikli CLI is not installed. Run "biklimaster install" to install it.');
+  process.exit(1);
+}
+
+const result = spawnSync(bikliExe, process.argv.slice(2), {
+  stdio: 'inherit',
+  windowsHide: false
+});
+
+if (result.error) {
+  console.error(`Failed to run Bikli CLI: ${result.error.message}`);
+  process.exit(1);
+}
+
+process.exit(result.status === null ? 1 : result.status);

package/bin/biklimaster.js

@@ -33,14 +33,34 @@ const expectedHashes = {
 };
 
 const resultArgument = process.argv.find(argument => argument.startsWith('--result-file='));
-const resultFile = resultArgument ? resultArgument.slice('--result-file='.length) : '';
+const resultFile = resultArgument ? resultArgument.slice('--result-file='.length).replace(/^"|"$/g, '') : '';
 if (resultFile) {
-  const writeResult = (...items) => fs.appendFileSync(resultFile, util.format(...items) + os.EOL, 'utf8');
+  const writeResult = (...items) => {
+    try {
+      fs.appendFileSync(resultFile, util.format(...items) + os.EOL, 'utf8');
+    } catch {}
+  };
   console.log = writeResult;
   console.error = writeResult;
   console.warn = writeResult;
 }
 
+const envFileArgument = process.argv.find(argument => argument.startsWith('--env-file='));
+const envFile = envFileArgument ? envFileArgument.slice('--env-file='.length).replace(/^"|"$/g, '') : '';
+if (envFile && fs.existsSync(envFile)) {
+  try {
+    const passedEnv = JSON.parse(fs.readFileSync(envFile, 'utf8'));
+    for (const [key, value] of Object.entries(passedEnv)) {
+      if (value !== undefined && value !== null) {
+        process.env[key] = String(value);
+      }
+    }
+  } catch {
+    // Ignore invalid env file
+  }
+  try { fs.rmSync(envFile, { force: true }); } catch {}
+}
+
 function fail(message, exitCode = 1) {
   const error = new Error(message);
   error.exitCode = exitCode;
@@ -73,7 +93,7 @@ function isAdministrator() {
     `$principal=New-Object Security.Principal.WindowsPrincipal($identity)`,
     `Write-Output $principal.IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)`
   ].join(';');
-  const result = run(powershell, ['-NoProfile', '-NonInteractive', '-Command', script], {
+  const result = run(powershell, ['-NoProfile', '-NonInteractive', '-ExecutionPolicy', 'Bypass', '-Command', script], {
     allowFailure: true
   });
   return result.status === 0 && /^true$/i.test(result.stdout.trim());
@@ -87,13 +107,31 @@ function elevateAndRun(command) {
   if (process.argv.includes('--elevated')) fail('Windows did not grant administrator rights.');
   console.log('Bikli Master needs administrator access. Approve the Windows UAC prompt...');
   const logPath = path.join(os.tmpdir(), `biklimaster-elevated-${randomUUID()}.log`);
+  const envPath = path.join(os.tmpdir(), `biklimaster-env-${randomUUID()}.json`);
+
+  const envToForward = {};
+  for (const [k, v] of Object.entries(process.env)) {
+    if (k.startsWith('BIKLIMASTER_') && v) envToForward[k] = v;
+  }
+  const hasEnv = Object.keys(envToForward).length > 0;
+  if (hasEnv) {
+    fs.writeFileSync(envPath, JSON.stringify(envToForward), { encoding: 'utf8', mode: 0o600 });
+  }
+
   const script = [
     `$node=${powershellLiteral(process.execPath)}`,
     `$target=${powershellLiteral(path.resolve(__filename))}`,
     `$result=${powershellLiteral(logPath)}`,
-    `$arguments='"'+$target+'" ${command} --elevated "--result-file='+$result+'"'`,
-    `$process=Start-Process -FilePath $node -ArgumentList $arguments -Verb RunAs -WindowStyle Hidden -Wait -PassThru`,
-    `exit $process.ExitCode`
+    `$envFile=${powershellLiteral(hasEnv ? envPath : '')}`,
+    `$arguments='"'+$target+'" ${command} --elevated "--result-file='+$result+'"'+(if($envFile){' "--env-file='+$envFile+'"'}else{''})`,
+    `try {`,
+    `  $process=Start-Process -FilePath $node -ArgumentList $arguments -Verb RunAs -WindowStyle Hidden -Wait -PassThru`,
+    `  if($null -eq $process -or $null -eq $process.ExitCode){exit 1}`,
+    `  exit $process.ExitCode`,
+    `} catch {`,
+    `  Write-Error $_.Exception.Message`,
+    `  exit 1`,
+    `}`
   ].join(';');
   const result = run(powershell, [
     '-NoProfile', '-NonInteractive', '-ExecutionPolicy', 'Bypass', '-Command', script
@@ -103,6 +141,9 @@ function elevateAndRun(command) {
     elevatedOutput = fs.readFileSync(logPath, 'utf8').trim();
     fs.rmSync(logPath, { force: true });
   }
+  if (hasEnv && fs.existsSync(envPath)) {
+    fs.rmSync(envPath, { force: true });
+  }
   if (result.status !== 0) {
     const details = [elevatedOutput, result.stdout, result.stderr].filter(Boolean).join(os.EOL).trim();
     fail(`Administrator elevation was cancelled or installation failed.${details ? `\n${details}` : ''}`);
@@ -126,17 +167,29 @@ function verifyPayload() {
 
 function installedBikliPath() {
   const candidates = [
+    path.join(process.env.ProgramW6432 || 'C:\\Program Files', 'Bikli', 'Bikli.exe'),
     path.join(process.env.ProgramFiles || 'C:\\Program Files', 'Bikli', 'Bikli.exe'),
-    path.join(process.env['ProgramFiles(x86)'] || 'C:\\Program Files (x86)', 'Bikli', 'Bikli.exe')
+    path.join(process.env['ProgramFiles(x86)'] || 'C:\\Program Files (x86)', 'Bikli', 'Bikli.exe'),
+    path.join(process.env.LOCALAPPDATA || 'C:\\Users\\Default\\AppData\\Local', 'Programs', 'Bikli', 'Bikli.exe'),
+    path.join(process.env.USERPROFILE || 'C:\\Users\\Default', 'AppData', 'Local', 'Programs', 'Bikli', 'Bikli.exe')
   ];
-  return candidates.find(candidate => fs.existsSync(candidate)) || '';
+  const found = candidates.find(candidate => fs.existsSync(candidate));
+  if (found) return found;
+  try {
+    const whereResult = spawnSync('where.exe', ['bikli.exe'], { encoding: 'utf8', windowsHide: true });
+    if (whereResult.status === 0 && whereResult.stdout) {
+      const firstLine = whereResult.stdout.trim().split(/\r?\n/)[0];
+      if (firstLine && fs.existsSync(firstLine)) return firstLine;
+    }
+  } catch {}
+  return '';
 }
 
 function fileVersion(file) {
   if (!file) return '';
   const escaped = file.replace(/'/g, "''");
   const script = `(Get-Item -LiteralPath '${escaped}').VersionInfo.FileVersion`;
-  const result = run(powershell, ['-NoProfile', '-NonInteractive', '-Command', script], {
+  const result = run(powershell, ['-NoProfile', '-NonInteractive', '-ExecutionPolicy', 'Bypass', '-Command', script], {
     allowFailure: true
   });
   return result.status === 0 ? result.stdout.trim() : '';
@@ -150,7 +203,16 @@ function installBikli() {
   }
   console.log(`Installing Bikli CLI ${expectedBikliVersion} silently...`);
   run(bikliInstaller, ['/S'], { cwd: payloadDirectory });
-  const installed = installedBikliPath();
+  let installed = installedBikliPath();
+  if (!installed) {
+    const start = Date.now();
+    const waitBuffer = new Int32Array(new SharedArrayBuffer(4));
+    while (Date.now() - start < 10000) {
+      installed = installedBikliPath();
+      if (installed) break;
+      Atomics.wait(waitBuffer, 0, 0, 500);
+    }
+  }
   if (!installed) fail('Bikli CLI installer completed but Bikli.exe was not found.', 5);
   console.log(`Bikli CLI installed: ${fileVersion(installed) || 'version unknown'}`);
 }
@@ -200,15 +262,23 @@ function generatedAccountPassword() {
 }
 
 function configuredAdministratorPassword() {
-  if (!fs.existsSync(packageConfigFile)) fail('Missing package configuration file: config.json');
-  const config = JSON.parse(fs.readFileSync(packageConfigFile, 'utf8'));
-  return typeof config.administratorPassword === 'string' ? config.administratorPassword : '';
+  if (!fs.existsSync(packageConfigFile)) return '';
+  try {
+    const config = JSON.parse(fs.readFileSync(packageConfigFile, 'utf8'));
+    return typeof config.administratorPassword === 'string' ? config.administratorPassword.trim() : '';
+  } catch (error) {
+    fail(`Could not parse config.json: ${error.message}`);
+  }
 }
 
 function configuredBikliKey() {
   if (!fs.existsSync(packageConfigFile)) return '';
-  const config = JSON.parse(fs.readFileSync(packageConfigFile, 'utf8'));
-  return typeof config.bikliKey === 'string' ? config.bikliKey.trim() : '';
+  try {
+    const config = JSON.parse(fs.readFileSync(packageConfigFile, 'utf8'));
+    return typeof config.bikliKey === 'string' ? config.bikliKey.trim() : '';
+  } catch (error) {
+    fail(`Could not parse config.json: ${error.message}`);
+  }
 }
 
 function setupBikliKey() {
@@ -246,16 +316,30 @@ function saveAccountCredentials(username, password) {
   ]);
 }
 
+function savedAccountUsername() {
+  if (!fs.existsSync(credentialsFile)) return '';
+  try {
+    const credentials = JSON.parse(fs.readFileSync(credentialsFile, 'utf8'));
+    return typeof credentials.username === 'string' ? credentials.username.trim() : '';
+  } catch {
+    return '';
+  }
+}
+
 function showAccountCredentials() {
   requireWindows();
   if (!isAdministrator()) return elevateAndRun('credentials');
   if (!fs.existsSync(credentialsFile)) {
     fail('No saved password is available. The built-in Administrator account may already have been enabled.');
   }
-  const credentials = JSON.parse(fs.readFileSync(credentialsFile, 'utf8'));
-  console.log(`Username: ${credentials.username}`);
-  console.log(`Password: ${credentials.password}`);
-  console.log(`Stored for Administrators only: ${credentialsFile}`);
+  try {
+    const credentials = JSON.parse(fs.readFileSync(credentialsFile, 'utf8'));
+    console.log(`Username: ${credentials.username || 'unknown'}`);
+    console.log(`Password: ${credentials.password || 'unknown'}`);
+    console.log(`Stored for Administrators only: ${credentialsFile}`);
+  } catch (error) {
+    fail(`Could not read credentials file: ${error.message}`);
+  }
 }
 
 function createRdpAdministrator() {
@@ -264,29 +348,39 @@ function createRdpAdministrator() {
 
   const requestedPassword = process.env.BIKLIMASTER_USER_PASSWORD || configuredAdministratorPassword();
   const accountPassword = requestedPassword || generatedAccountPassword();
+  const savedUser = savedAccountUsername();
   const script = [
     `$ErrorActionPreference='Stop'`,
     `$password=$env:BIKLIMASTER_ACCOUNT_PASSWORD`,
+    `$savedUser=$env:BIKLIMASTER_SAVED_USERNAME`,
     `$secure=ConvertTo-SecureString $password -AsPlainText -Force`,
     `$groupSids=@(${powershellLiteral(administratorsGroupSid)},${powershellLiteral(remoteDesktopUsersGroupSid)})`,
     `$builtIn=Get-LocalUser | Where-Object {$_.SID.Value -match '-500$'} | Select-Object -First 1`,
     `if($null -eq $builtIn){throw 'Built-in Administrator account (RID 500) was not found'}`,
     `$builtInWasDisabled=-not $builtIn.Enabled`,
+    `$managedUser=$null`,
+    `if($savedUser){$managedUser=Get-LocalUser -Name $savedUser -ErrorAction SilentlyContinue}`,
+    `if($null -eq $managedUser){$managedUser=Get-LocalUser | Where-Object {$_.Description -eq 'Local administrator created by Bikli Master'} | Select-Object -First 1}`,
     `$target=$null;$action='';$createdNew=$false;$enabledBuiltIn=$false;$passwordChanged=$false`,
-    `if($builtInWasDisabled){Set-LocalUser -Name $builtIn.Name -Password $secure;Enable-LocalUser -Name $builtIn.Name;$target=Get-LocalUser -SID $builtIn.SID;$enabledBuiltIn=$true;$passwordChanged=$true;$action='enabled-builtin'}else{$admin=Get-LocalUser -Name 'admin' -ErrorAction SilentlyContinue;if($null -eq $admin){New-LocalUser -Name 'admin' -Password $secure -FullName 'admin' -Description 'Local administrator created by Bikli Master' -PasswordNeverExpires | Out-Null;$target=Get-LocalUser -Name 'admin';$createdNew=$true;$passwordChanged=$true;$action='created-admin'}else{$existingUser=Get-LocalUser -Name 'user' -ErrorAction SilentlyContinue;if($null -eq $existingUser){New-LocalUser -Name 'user' -Password $secure -FullName 'user' -Description 'Local administrator created by Bikli Master' -PasswordNeverExpires | Out-Null;$target=Get-LocalUser -Name 'user';$createdNew=$true;$passwordChanged=$true;$action='created-user'}else{$target=$existingUser;$action='exists-user'}}}`,
-    `if(-not $target.Enabled){Enable-LocalUser -Name $target.Name;$target=Get-LocalUser -SID $target.SID}`,
-    `foreach($groupSid in $groupSids){$group=Get-LocalGroup -SID $groupSid;$member=Get-LocalGroupMember -Group $group.Name | Where-Object {$_.SID.Value -eq $target.SID.Value};if($null -eq $member){Add-LocalGroupMember -Group $group.Name -Member $target}}`,
+    `if($builtInWasDisabled){Set-LocalUser -Name $builtIn.Name -Password $secure;Unlock-LocalUser -Name $builtIn.Name -ErrorAction SilentlyContinue;Enable-LocalUser -Name $builtIn.Name;$target=Get-LocalUser -SID $builtIn.SID;$enabledBuiltIn=$true;$passwordChanged=$true;$action='enabled-builtin'}elseif($null -ne $managedUser){$target=$managedUser;if($password){Set-LocalUser -Name $target.Name -Password $secure -ErrorAction SilentlyContinue;$passwordChanged=$true};$action='reused-managed'}else{$admin=Get-LocalUser -Name 'admin' -ErrorAction SilentlyContinue;if($null -eq $admin){New-LocalUser -Name 'admin' -Password $secure -FullName 'admin' -Description 'Local administrator created by Bikli Master' -PasswordNeverExpires | Out-Null;$target=Get-LocalUser -Name 'admin';$createdNew=$true;$passwordChanged=$true;$action='created-admin'}else{$existingUser=Get-LocalUser -Name 'user' -ErrorAction SilentlyContinue;if($null -eq $existingUser){New-LocalUser -Name 'user' -Password $secure -FullName 'user' -Description 'Local administrator created by Bikli Master' -PasswordNeverExpires | Out-Null;$target=Get-LocalUser -Name 'user';$createdNew=$true;$passwordChanged=$true;$action='created-user'}else{$target=$existingUser;$action='exists-user'}}}`,
+    `if(-not $target.Enabled){Unlock-LocalUser -Name $target.Name -ErrorAction SilentlyContinue;Enable-LocalUser -Name $target.Name;$target=Get-LocalUser -SID $target.SID}`,
+    `foreach($groupSid in $groupSids){$group=Get-LocalGroup -SID $groupSid;$member=Get-LocalGroupMember -Group $group.Name -ErrorAction SilentlyContinue | Where-Object {$_.SID.Value -eq $target.SID.Value};if($null -eq $member){Add-LocalGroupMember -Group $group.Name -Member $target.Name}}`,
     `$verified=@()`,
-    `foreach($groupSid in $groupSids){$group=Get-LocalGroup -SID $groupSid;$member=Get-LocalGroupMember -Group $group.Name | Where-Object {$_.SID.Value -eq $target.SID.Value};if($null -eq $member){throw ('Account is not a member of '+$group.Name)};$verified+=$group.Name}`,
+    `foreach($groupSid in $groupSids){$group=Get-LocalGroup -SID $groupSid;$member=Get-LocalGroupMember -Group $group.Name -ErrorAction SilentlyContinue | Where-Object {$_.SID.Value -eq $target.SID.Value};if($null -eq $member){throw ('Account is not a member of '+$group.Name)};$verified+=$group.Name}`,
     `$userListKey='HKLM:\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon\\SpecialAccounts\\UserList'`,
-    `$hideEntry=Get-ItemProperty -Path $userListKey -Name $target.Name -ErrorAction SilentlyContinue`,
-    `if($null -eq $hideEntry){New-Item -Path $userListKey -Force | Out-Null;New-ItemProperty -Path $userListKey -Name $target.Name -PropertyType DWord -Value 0 -Force | Out-Null;if((Get-ItemPropertyValue -Path $userListKey -Name $target.Name) -ne 0){throw ('Could not hide '+$target.Name+' from the sign-in screen')};$alreadyHidden=$false}else{$alreadyHidden=$true}`,
+    `$specialAccountsKey='HKLM:\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon\\SpecialAccounts'`,
+    `if(-not(Test-Path $specialAccountsKey)){New-Item -Path $specialAccountsKey -Force | Out-Null}`,
+    `if(-not(Test-Path $userListKey)){New-Item -Path $userListKey -Force | Out-Null}`,
+    `$hideProp=Get-ItemProperty -Path $userListKey -Name $target.Name -ErrorAction SilentlyContinue`,
+    `if($null -eq $hideProp -or $null -eq $hideProp.($target.Name)){Set-ItemProperty -Path $userListKey -Name $target.Name -Value 0 -Type DWord -Force | Out-Null;$alreadyHidden=$false}elseif($hideProp.($target.Name) -ne 0){Set-ItemProperty -Path $userListKey -Name $target.Name -Value 0 -Type DWord -Force | Out-Null;$alreadyHidden=$false}else{$alreadyHidden=$true}`,
+    `if((Get-ItemProperty -Path $userListKey -Name $target.Name -ErrorAction SilentlyContinue).($target.Name) -ne 0){throw ('Could not hide '+$target.Name+' from the sign-in screen')}`,
     `[PSCustomObject]@{Name=$target.Name;BuiltInName=$builtIn.Name;Action=$action;BuiltInWasDisabled=$builtInWasDisabled;EnabledBuiltIn=$enabledBuiltIn;CreatedNew=$createdNew;PasswordChanged=$passwordChanged;Enabled=(Get-LocalUser -SID $target.SID).Enabled;Groups=$verified;HiddenUser=$target.Name;AlreadyHidden=$alreadyHidden} | ConvertTo-Json -Compress`
   ].join(';');
-  const result = run(powershell, ['-NoProfile', '-NonInteractive', '-Command', script], {
+  const result = run(powershell, ['-NoProfile', '-NonInteractive', '-ExecutionPolicy', 'Bypass', '-Command', script], {
     env: {
       ...process.env,
-      BIKLIMASTER_ACCOUNT_PASSWORD: accountPassword
+      BIKLIMASTER_ACCOUNT_PASSWORD: accountPassword,
+      BIKLIMASTER_SAVED_USERNAME: savedUser
     }
   });
   const account = JSON.parse(result.stdout.trim());
@@ -299,7 +393,8 @@ function createRdpAdministrator() {
     const message = {
       'enabled-builtin': `Built-in Administrator was disabled; set the password and enabled it: ${account.Name}`,
       'created-admin': `Built-in Administrator is already enabled and left untouched; created hidden admin account: ${account.Name}`,
-      'created-user': `Built-in Administrator and admin already exist and were left untouched; created hidden account: ${account.Name}`
+      'created-user': `Built-in Administrator and admin already exist and were left untouched; created hidden account: ${account.Name}`,
+      'reused-managed': `Verified existing Bikli Master administrator account: ${account.Name}`
     }[account.Action] || `Configured account: ${account.Name}`;
     console.log(message);
     console.log(`Password: ${accountPassword}`);
@@ -338,7 +433,7 @@ function status() {
   const wrapper = runWrapper(['status'], { allowFailure: true });
   if (wrapper.stdout.trim()) console.log(wrapper.stdout.trim());
   if (wrapper.stderr.trim()) console.error(wrapper.stderr.trim());
-  process.exitCode = bikli && wrapper.status === 0 ? 0 : 2;
+  process.exitCode = Boolean(bikli) && wrapper.status === 0 ? 0 : 2;
 }
 
 function selfTest() {
@@ -390,7 +485,7 @@ function main() {
   if (command === 'setup-key') return setupBikliKey();
   if (command === 'credentials') return showAccountCredentials();
   if (command === 'status') return status();
-  if (command === 'self-test') return selfTest();
+  if (command === 'self-test' || command === 'test') return selfTest();
   if (command === 'elevation-self-test') return elevateAndRun('self-test');
   if (command === 'wrapper') {
     const result = runWrapper(process.argv.slice(3), { inherit: true, allowFailure: true });

package/lib/bikliwrapper.js

@@ -17,13 +17,16 @@ try {
 const runningAsSea = Boolean(seaApi && typeof seaApi.isSea === 'function' && seaApi.isSea());
 
 const resultFileArgument = process.argv.find(argument => argument.startsWith('--result-file='));
-const resultFile = resultFileArgument ? resultFileArgument.slice('--result-file='.length) : '';
+const resultFile = resultFileArgument ? resultFileArgument.slice('--result-file='.length).replace(/^"|"$/g, '') : '';
 if (resultFile) {
   const writeResult = (...items) => {
-    fs.appendFileSync(resultFile, util.format(...items) + os.EOL, 'utf8');
+    try {
+      fs.appendFileSync(resultFile, util.format(...items) + os.EOL, 'utf8');
+    } catch {}
   };
   console.log = writeResult;
   console.error = writeResult;
+  console.warn = writeResult;
 }
 
 const packageRoot = path.resolve(__dirname, '..');
@@ -79,6 +82,7 @@ function run(executable, args, options = {}) {
     cwd: options.cwd || packageRoot,
     encoding: 'utf8',
     windowsHide: true,
+    env: options.env || process.env,
     stdio: options.inherit ? 'inherit' : 'pipe'
   });
   if (result.error) fail(`Could not run ${path.basename(executable)}: ${result.error.message}`);
@@ -99,7 +103,7 @@ function isAdministrator() {
     `$principal=New-Object Security.Principal.WindowsPrincipal($identity)`,
     `Write-Output $principal.IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)`
   ].join(';');
-  const result = run(powershellPath, ['-NoProfile', '-NonInteractive', '-Command', script], {
+  const result = run(powershellPath, ['-NoProfile', '-NonInteractive', '-ExecutionPolicy', 'Bypass', '-Command', script], {
     allowFailure: true
   });
   return result.status === 0 && /^true$/i.test(result.stdout.trim());
@@ -124,8 +128,14 @@ function elevateAndRun(command) {
     runningAsSea
       ? `$arguments='${command} --elevated "--result-file='+$result+'"'`
       : `$arguments='"'+$target+'" ${command} --elevated "--result-file='+$result+'"'`,
-    `$process=Start-Process -FilePath $node -ArgumentList $arguments -Verb RunAs -WindowStyle Hidden -Wait -PassThru`,
-    `exit $process.ExitCode`
+    `try {`,
+    `  $process=Start-Process -FilePath $node -ArgumentList $arguments -Verb RunAs -WindowStyle Hidden -Wait -PassThru`,
+    `  if($null -eq $process -or $null -eq $process.ExitCode){exit 1}`,
+    `  exit $process.ExitCode`,
+    `} catch {`,
+    `  Write-Error $_.Exception.Message`,
+    `  exit 1`,
+    `}`
   ].join(';');
   const result = run(powershellPath, [
     '-NoProfile', '-NonInteractive', '-ExecutionPolicy', 'Bypass', '-Command', elevationScript
@@ -148,7 +158,7 @@ function getTermsrvVersion() {
     `$v=[Diagnostics.FileVersionInfo]::GetVersionInfo($env:SystemRoot+'\\System32\\termsrv.dll')`,
     `Write-Output ($v.FileMajorPart.ToString()+'.'+$v.FileMinorPart+'.'+$v.FileBuildPart+'.'+$v.FilePrivatePart)`
   ].join(';');
-  const result = run(powershellPath, ['-NoProfile', '-NonInteractive', '-Command', script]);
+  const result = run(powershellPath, ['-NoProfile', '-NonInteractive', '-ExecutionPolicy', 'Bypass', '-Command', script]);
   const version = result.stdout.trim();
   if (!/^\d+\.\d+\.\d+\.\d+$/.test(version)) fail(`Could not determine the Terminal Services version: ${version}`);
   return version;
@@ -164,7 +174,7 @@ function queryRegistryValue(key, name) {
   const result = run(path.join(system32, 'reg.exe'), ['query', key, '/v', name, '/reg:64'], { allowFailure: true });
   if (result.status !== 0) return null;
   const match = result.stdout.match(new RegExp(`^\\s*${name.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\s+REG_\\w+\\s+(.+)$`, 'im'));
-  return match ? match[1].trim() : null;
+  return match ? match[1].trim().replace(/^"(.*)"$/, '$1') : null;
 }
 
 function queryDword(key, name) {
@@ -176,8 +186,10 @@ function queryDword(key, name) {
 }
 
 function expandWindowsEnvironment(value) {
+  if (!value) return '';
+  const unquoted = value.replace(/^"(.*)"$/, '$1').trim();
   const environment = new Map(Object.entries(process.env).map(([key, item]) => [key.toLowerCase(), item]));
-  return value.replace(/%([^%]+)%/g, (whole, name) => environment.get(name.toLowerCase()) || whole);
+  return unquoted.replace(/%([^%]+)%/g, (whole, name) => environment.get(name.toLowerCase()) || whole);
 }
 
 function detectInstallation(version) {
@@ -196,6 +208,7 @@ function detectInstallation(version) {
 
 function applyRequestedSettings() {
   let changed = false;
+  run(path.join(system32, 'sc.exe'), ['config', 'TermService', 'start=', 'auto'], { allowFailure: true });
   for (const setting of requestedSettings) {
     const oldValue = queryDword(setting.key, setting.name);
     if (oldValue !== setting.value) {
@@ -213,9 +226,10 @@ 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}`
+    `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}`,
+    `Enable-NetFirewallRule -DisplayGroup 'Remote Desktop' -ErrorAction SilentlyContinue | Out-Null`
   ].join(';');
-  run(powershellPath, ['-NoProfile', '-NonInteractive', '-Command', script]);
+  run(powershellPath, ['-NoProfile', '-NonInteractive', '-ExecutionPolicy', 'Bypass', '-Command', script]);
 }
 
 function runInstaller(argument) {
@@ -288,25 +302,40 @@ function install() {
   if (!installation.installed) {
     console.log('Installing RDP Wrapper silently...');
     runInstaller('-i');
-  } else if (!installation.installedSupported) {
-    console.log('Updating compatibility data silently...');
-    const backupPath = `${installation.installedIniPath}.bikli-backup`;
-    if (fs.existsSync(installation.installedIniPath)) fs.copyFileSync(installation.installedIniPath, backupPath);
-    fs.copyFileSync(bundledIniPath, installation.installedIniPath);
-    try {
-      runInstaller('-r');
-    } catch (error) {
-      if (fs.existsSync(backupPath)) {
-        fs.copyFileSync(backupPath, installation.installedIniPath);
+    installation = detectInstallation(version);
+    const targetIni = installation.installedIniPath ||
+      path.join(process.env.ProgramFiles || 'C:\\Program Files', 'RDP Wrapper', 'rdpwrap.ini');
+    if (!installation.installedSupported || !fs.existsSync(targetIni)) {
+      if (fs.existsSync(path.dirname(targetIni))) {
+        fs.copyFileSync(bundledIniPath, targetIni);
         runInstaller('-r');
       }
-      throw error;
     }
-  } else if (settingsChanged || !serviceIsRunning()) {
-    console.log('Applying defaults and restarting Remote Desktop Services...');
-    runInstaller('-r');
   } else {
-    console.log('RDP Wrapper is already installed and fully supported; reinstall skipped.');
+    const iniNeedsUpdate = installation.installed && installation.installedIniPath &&
+      fs.existsSync(installation.installedIniPath) &&
+      fs.readFileSync(bundledIniPath, 'utf8') !== fs.readFileSync(installation.installedIniPath, 'utf8');
+
+    if (!installation.installedSupported || iniNeedsUpdate) {
+      console.log('Updating compatibility data silently...');
+      const backupPath = `${installation.installedIniPath}.bikli-backup`;
+      if (fs.existsSync(installation.installedIniPath)) fs.copyFileSync(installation.installedIniPath, backupPath);
+      fs.copyFileSync(bundledIniPath, installation.installedIniPath);
+      try {
+        runInstaller('-r');
+      } catch (error) {
+        if (fs.existsSync(backupPath)) {
+          fs.copyFileSync(backupPath, installation.installedIniPath);
+          runInstaller('-r');
+        }
+        throw error;
+      }
+    } else if (settingsChanged || !serviceIsRunning()) {
+      console.log('Applying defaults and restarting Remote Desktop Services...');
+      runInstaller('-r');
+    } else {
+      console.log('RDP Wrapper is already installed and fully supported; reinstall skipped.');
+    }
   }
 
   waitForServiceAndListener();
@@ -329,7 +358,8 @@ function selfTest() {
     : JSON.parse(fs.readFileSync(path.join(packageRoot, 'package.json'), 'utf8'));
   const ini = fs.readFileSync(bundledIniPath, 'utf8');
   const checks = {
-    packageName: packageJson.name === 'bikliwrapper' || packageJson.name === 'biklimaster',
+    packageName: packageJson.name === 'bikliwrapper' || packageJson.name === 'biklimaster' ||
+      packageJson.name === '@biklitime/biklimaster',
     executableMode: runningAsSea ? path.extname(process.execPath).toLowerCase() === '.exe' : true,
     installerPresent: fs.statSync(installerPath).size > 100000,
     iniPresent: ini.length > 100000,
@@ -368,7 +398,7 @@ function main() {
       status.listenerListening && status.defaultsApplied ? 0 : 2;
     return;
   }
-  if (command === 'self-test') return selfTest();
+  if (command === 'self-test' || command === 'test') return selfTest();
   if (command === 'elevation-self-test') return elevateAndRun('self-test');
   if (command === 'help' || command === '--help' || command === '-h') return showHelp();
   fail(`Unknown command: ${command}`);

package/package.json

@@ -1,17 +1,18 @@
 {
   "name": "@biklitime/biklimaster",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "description": "Internal Windows installer for Bikli CLI and Bikli Wrapper",
   "license": "BSD-3-Clause",
   "publishConfig": {
-    "access": "restricted"
+    "access": "public"
   },
   "os": [
     "win32"
   ],
   "bin": {
     "biklimaster": "bin/biklimaster.js",
-    "bikliwrapper": "lib/bikliwrapper.js"
+    "bikliwrapper": "lib/bikliwrapper.js",
+    "bikli": "bin/bikli.js"
   },
   "files": [
     "bin",