@atom-js-org/cli 0.4.0-alpha.0 → 0.4.2-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atom-js-org/cli",
-  "version": "0.4.0-alpha.0",
+  "version": "0.4.2-alpha.0",
   "description": "CLI for running and building AtomJS desktop applications.",
   "bin": {
     "atom": "bin/atom.cjs"

package/src/build.cjs

@@ -106,7 +106,7 @@ async function localBuild(project, target, options = {}) {
     }
 
     const manifest = {
-      atomjsVersion: '0.3.0-alpha.0',
+      atomjsVersion: '0.4.2-alpha.0',
       target,
       productName,
       appId: project.config.appId,
@@ -311,6 +311,9 @@ async function createSeaLauncher({ executablePath, appDir, target, productName,
   await run(process.execPath, ['--experimental-sea-config', configPath], { cwd: work });
   await fs.promises.copyFile(process.execPath, executablePath);
 
+  if (target === 'windows') {
+    await prepareWindowsExecutableForInjection(executablePath);
+  }
   if (target === 'macos' && commandExists('codesign', ['--version'])) {
     spawnSync('codesign', ['--remove-signature', executablePath], { stdio: 'ignore' });
   }
@@ -320,13 +323,79 @@ async function createSeaLauncher({ executablePath, appDir, target, productName,
     machoSegmentName: 'NODE_SEA'
   });
 
-  if (target !== 'windows') await fs.promises.chmod(executablePath, 0o755);
+  if (target === 'windows') {
+    await setWindowsGuiSubsystem(executablePath);
+  } else {
+    await fs.promises.chmod(executablePath, 0o755);
+  }
   if (target === 'macos' && commandExists('codesign', ['--version'])) {
     await run('codesign', ['--force', '--sign', '-', executablePath]);
   }
   await fse.remove(work);
 }
 
+
+async function prepareWindowsExecutableForInjection(executablePath) {
+  const image = await fs.promises.readFile(executablePath);
+  const pe = readPortableExecutableLayout(image);
+  const certificateDirectory = pe.dataDirectoryOffset + (8 * 4);
+  const certificateOffset = image.readUInt32LE(certificateDirectory);
+  const certificateSize = image.readUInt32LE(certificateDirectory + 4);
+
+  image.writeUInt32LE(0, certificateDirectory);
+  image.writeUInt32LE(0, certificateDirectory + 4);
+  image.writeUInt32LE(0, pe.optionalHeaderOffset + 64);
+
+  const certificateEnd = certificateOffset + certificateSize;
+  const output = certificateOffset > 0 && certificateSize > 0 && certificateEnd === image.length
+    ? image.subarray(0, certificateOffset)
+    : image;
+  await fs.promises.writeFile(executablePath, output);
+}
+
+async function setWindowsGuiSubsystem(executablePath) {
+  const image = await fs.promises.readFile(executablePath);
+  const pe = readPortableExecutableLayout(image);
+  image.writeUInt16LE(2, pe.optionalHeaderOffset + 68);
+  image.writeUInt32LE(0, pe.optionalHeaderOffset + 64);
+  await fs.promises.writeFile(executablePath, image);
+}
+
+function readPortableExecutableLayout(image) {
+  if (image.length < 0x100 || image.toString('ascii', 0, 2) !== 'MZ') {
+    throw new Error('AtomJS expected a Windows PE executable but the DOS header is missing.');
+  }
+
+  const peOffset = image.readUInt32LE(0x3c);
+  const coffHeaderSize = 24;
+  if (peOffset < 0x40 || peOffset + coffHeaderSize > image.length || image.readUInt32LE(peOffset) !== 0x00004550) {
+    throw new Error('AtomJS expected a Windows PE executable but the PE header is invalid.');
+  }
+
+  const optionalHeaderSize = image.readUInt16LE(peOffset + 20);
+  const optionalHeaderOffset = peOffset + coffHeaderSize;
+  const optionalHeaderEnd = optionalHeaderOffset + optionalHeaderSize;
+  if (optionalHeaderSize < 2 || optionalHeaderEnd > image.length) {
+    throw new Error('AtomJS expected a complete Windows PE optional header.');
+  }
+
+  const magic = image.readUInt16LE(optionalHeaderOffset);
+  if (magic !== 0x10b && magic !== 0x20b) {
+    throw new Error(`AtomJS does not support Windows PE optional-header magic 0x${magic.toString(16)}.`);
+  }
+
+  const dataDirectoryOffset = optionalHeaderOffset + (magic === 0x20b ? 112 : 96);
+  const certificateDirectoryEnd = dataDirectoryOffset + (8 * 5);
+  if (certificateDirectoryEnd > optionalHeaderEnd) {
+    throw new Error('AtomJS expected the Windows PE certificate data directory.');
+  }
+
+  return {
+    optionalHeaderOffset,
+    dataDirectoryOffset
+  };
+}
+
 function createEmbeddedLauncherSource(productName) {
   return `
 'use strict';
@@ -410,6 +479,14 @@ async function packageWindows({ project, buildRoot, unpacked, executableName, pr
   const nsisPath = path.join(buildRoot, 'installer.nsi');
   const installerPath = path.join(buildRoot, `${productName} Installer.exe`);
   const escapedSource = unpacked.replace(/\\/g, '\\\\');
+  const version = String(project.packageJson.version || '0.0.0');
+  const author = project.packageJson.author;
+  const publisher = typeof author === 'string'
+    ? author
+    : author && typeof author === 'object' && author.name
+      ? author.name
+      : 'AtomJS application';
+  const uninstallKey = `Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\${escapeNsis(project.config.appId)}`;
   const credit = project.config.installerCredit
     ? `!define MUI_WELCOMEPAGE_TEXT "This installer will install ${escapeNsis(productName)}.$\\r$\\n$\\r$\\nPowered by AtomJS — https://github.com/Atom-js-org/atom"`
     : '';
@@ -427,27 +504,40 @@ ${credit}
 !insertmacro MUI_PAGE_WELCOME
 !insertmacro MUI_PAGE_DIRECTORY
 !insertmacro MUI_PAGE_INSTFILES
+!define MUI_FINISHPAGE_RUN "$INSTDIR\\${escapeNsis(executableName)}"
 !insertmacro MUI_PAGE_FINISH
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
 !insertmacro MUI_LANGUAGE "English"
 Section "Install"
+  SetShellVarContext current
   SetOutPath "$INSTDIR"
   File /r "${escapedSource}\\*"
   CreateDirectory "$SMPROGRAMS\\${escapeNsis(productName)}"
   CreateShortcut "$SMPROGRAMS\\${escapeNsis(productName)}\\${escapeNsis(productName)}.lnk" "$INSTDIR\\${escapeNsis(executableName)}"
   CreateShortcut "$DESKTOP\\${escapeNsis(productName)}.lnk" "$INSTDIR\\${escapeNsis(executableName)}"
   WriteUninstaller "$INSTDIR\\Uninstall.exe"
+  WriteRegStr HKCU "${uninstallKey}" "DisplayName" "${escapeNsis(productName)}"
+  WriteRegStr HKCU "${uninstallKey}" "DisplayVersion" "${escapeNsis(version)}"
+  WriteRegStr HKCU "${uninstallKey}" "Publisher" "${escapeNsis(publisher)}"
+  WriteRegStr HKCU "${uninstallKey}" "DisplayIcon" "$INSTDIR\\${escapeNsis(executableName)}"
+  WriteRegStr HKCU "${uninstallKey}" "UninstallString" "$\\\"$INSTDIR\\Uninstall.exe$\\\""
+  WriteRegDWORD HKCU "${uninstallKey}" "NoModify" 1
+  WriteRegDWORD HKCU "${uninstallKey}" "NoRepair" 1
 SectionEnd
 Section "Uninstall"
+  SetShellVarContext current
   Delete "$DESKTOP\\${escapeNsis(productName)}.lnk"
   RMDir /r "$SMPROGRAMS\\${escapeNsis(productName)}"
-  DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${escapeNsis(project.config.appId)}"
+  DeleteRegKey HKCU "${uninstallKey}"
   RMDir /r "$INSTDIR"
 SectionEnd
 `;
   await fs.promises.writeFile(nsisPath, script.trimStart(), 'utf8');
 
-  if (commandExists('makensis', ['/VERSION'])) {
-    await run('makensis', [nsisPath]);
+  const makensis = resolveNsisExecutable();
+  if (makensis) {
+    await run(makensis, [nsisPath]);
     if (fs.existsSync(installerPath)) outputs.push(installerPath);
   } else {
     console.warn('NSIS was not found; installer.nsi was generated but the .exe installer was skipped.');
@@ -455,6 +545,19 @@ SectionEnd
   return outputs;
 }
 
+function resolveNsisExecutable() {
+  const candidates = [
+    process.env.MAKENSIS_PATH,
+    process.env.NSIS_HOME && path.join(process.env.NSIS_HOME, 'makensis.exe'),
+    process.env['ProgramFiles(x86)'] && path.join(process.env['ProgramFiles(x86)'], 'NSIS', 'makensis.exe'),
+    process.env.ProgramFiles && path.join(process.env.ProgramFiles, 'NSIS', 'makensis.exe'),
+    process.env.LOCALAPPDATA && path.join(process.env.LOCALAPPDATA, 'Programs', 'NSIS', 'makensis.exe')
+  ].filter(Boolean);
+
+  if (commandExists('makensis', ['/VERSION'])) return 'makensis';
+  return candidates.find((candidate) => fs.existsSync(candidate)) || null;
+}
+
 async function packageMacOS({ project, buildRoot, unpacked, executableName, productName, hostSource }) {
   const outputs = [];
   const appBundle = path.join(buildRoot, `${productName}.app`);
@@ -693,4 +796,4 @@ function xml(value) {
   return String(value).replace(/[<>&'\"]/g, (char) => ({ '<': '&lt;', '>': '&gt;', '&': '&amp;', "'": '&apos;', '"': '&quot;' })[char]);
 }
 
-module.exports = { buildCommand, localBuild, createApplicationPayload };
+module.exports = { buildCommand, localBuild, createApplicationPayload, readPortableExecutableLayout };

package/src/doctor.cjs

@@ -12,8 +12,9 @@ async function doctorCommand(options = {}) {
 
   if (process.platform === 'win32') {
     rows.push(check('PowerShell', commandExists('powershell.exe', ['-NoProfile', '-Command', '$PSVersionTable.PSVersion.ToString()'])));
-    rows.push(check('WebView2 Runtime', checkWindowsWebView2(), 'required by the native WebView'));
-    rows.push(check('NSIS (optional installer)', commandExists('makensis', ['/VERSION'])));
+    const webView2Version = getWindowsWebView2Version();
+    rows.push(check('WebView2 Runtime', Boolean(webView2Version), webView2Version || 'required by the native WebView'));
+    rows.push(check('NSIS (optional installer)', Boolean(resolveNsisExecutable())));
   } else if (process.platform === 'darwin') {
     rows.push(check('Xcode Command Line Tools', commandExists('/usr/bin/xcrun', ['--version']), 'required to compile the native Cocoa host'));
     rows.push(check('Clang', commandExists('/usr/bin/xcrun', ['clang', '--version'])));
@@ -69,18 +70,43 @@ function pkgConfigExists(name) {
   return !result.error && result.status === 0;
 }
 
-function checkWindowsWebView2() {
+function getWindowsWebView2Version() {
   const script = `
 $paths = @(
-  'HKLM:\\SOFTWARE\\WOW6432Node\\Microsoft\\EdgeUpdate\\Clients\\{F1E7E4A4-BD05-43A5-BCC0-B7F5E0E9D7F5}',
-  'HKLM:\\SOFTWARE\\Microsoft\\EdgeUpdate\\Clients\\{F1E7E4A4-BD05-43A5-BCC0-B7F5E0E9D7F5}',
-  'HKCU:\\Software\\Microsoft\\EdgeUpdate\\Clients\\{F1E7E4A4-BD05-43A5-BCC0-B7F5E0E9D7F5}'
+  'HKLM:\\SOFTWARE\\WOW6432Node\\Microsoft\\EdgeUpdate\\Clients\\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}',
+  'HKLM:\\SOFTWARE\\Microsoft\\EdgeUpdate\\Clients\\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}',
+  'HKCU:\\Software\\Microsoft\\EdgeUpdate\\Clients\\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}'
 )
-foreach ($p in $paths) { if (Test-Path $p) { exit 0 } }
+foreach ($p in $paths) {
+  try {
+    $version = Get-ItemPropertyValue -Path $p -Name 'pv' -ErrorAction Stop
+    if ($version -and $version -ne '0.0.0.0') {
+      Write-Output $version
+      exit 0
+    }
+  } catch {}
+}
 exit 1
 `;
-  const result = spawnSync('powershell.exe', ['-NoProfile', '-Command', script], { stdio: 'ignore' });
-  return !result.error && result.status === 0;
+  const result = spawnSync('powershell.exe', ['-NoProfile', '-Command', script], {
+    encoding: 'utf8',
+    windowsHide: true
+  });
+  if (result.error || result.status !== 0) return null;
+  return String(result.stdout || '').trim() || null;
+}
+
+function resolveNsisExecutable() {
+  const candidates = [
+    process.env.MAKENSIS_PATH,
+    process.env.NSIS_HOME && path.join(process.env.NSIS_HOME, 'makensis.exe'),
+    process.env['ProgramFiles(x86)'] && path.join(process.env['ProgramFiles(x86)'], 'NSIS', 'makensis.exe'),
+    process.env.ProgramFiles && path.join(process.env.ProgramFiles, 'NSIS', 'makensis.exe'),
+    process.env.LOCALAPPDATA && path.join(process.env.LOCALAPPDATA, 'Programs', 'NSIS', 'makensis.exe')
+  ].filter(Boolean);
+
+  if (commandExists('makensis', ['/VERSION'])) return 'makensis';
+  return candidates.find((candidate) => fs.existsSync(candidate)) || null;
 }
 
 module.exports = { doctorCommand };

package/src/init.cjs

@@ -30,14 +30,14 @@ async function initCommand(directory, options = {}) {
       start: 'atom run build'
     },
     dependencies: {
-      '@atom-js-org/runtime': '0.3.0-alpha.0',
-      electron: 'npm:@atom-js-org/electron@0.3.0-alpha.0'
+      '@atom-js-org/runtime': '0.4.2-alpha.0',
+      electron: 'npm:@atom-js-org/electron@0.4.2-alpha.0'
     },
     optionalDependencies: {
       'webview-nodejs': '0.5.0'
     },
     devDependencies: {
-      '@atom-js-org/cli': '0.3.0-alpha.0'
+      '@atom-js-org/cli': '0.4.2-alpha.0'
     },
     overrides: {
       tar: '7.5.20'