@atom-js-org/cli 0.4.1-alpha.0 → 0.4.3-alpha.0

package/package.json

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

package/src/build.cjs

@@ -70,6 +70,7 @@ async function localBuild(project, target, options = {}) {
       appDir,
       target,
       productName,
+      appId: project.config.appId,
       payloadPath
     });
 
@@ -106,7 +107,7 @@ async function localBuild(project, target, options = {}) {
     }
 
     const manifest = {
-      atomjsVersion: '0.3.0-alpha.0',
+      atomjsVersion: '0.4.3-alpha.0',
       target,
       productName,
       appId: project.config.appId,
@@ -287,7 +288,7 @@ async function createApplicationPayload(appDir, outputPath) {
   await fs.promises.writeFile(outputPath, compressed);
 }
 
-async function createSeaLauncher({ executablePath, appDir, target, productName, payloadPath = null }) {
+async function createSeaLauncher({ executablePath, appDir, target, productName, appId, payloadPath = null }) {
   const work = path.join(path.dirname(executablePath), '.sea-' + crypto.randomBytes(5).toString('hex'));
   await fse.ensureDir(work);
   const launcherPath = path.join(work, 'launcher.cjs');
@@ -295,7 +296,7 @@ async function createSeaLauncher({ executablePath, appDir, target, productName,
   const configPath = path.join(work, 'sea-config.json');
 
   if (!payloadPath) throw new Error('AtomJS SEA payload is required.');
-  const launcher = createEmbeddedLauncherSource(productName);
+  const launcher = createEmbeddedLauncherSource(productName, appId);
   await fs.promises.writeFile(launcherPath, launcher, 'utf8');
 
   const seaConfig = {
@@ -314,8 +315,8 @@ async function createSeaLauncher({ executablePath, appDir, target, productName,
   if (target === 'windows') {
     await prepareWindowsExecutableForInjection(executablePath);
   }
-  if (target === 'macos' && commandExists('codesign', ['--version'])) {
-    spawnSync('codesign', ['--remove-signature', executablePath], { stdio: 'ignore' });
+  if (target === 'macos' && hasMacCodeSigningTool()) {
+    spawnSync('/usr/bin/codesign', ['--remove-signature', executablePath], { stdio: 'ignore' });
   }
 
   await inject(executablePath, 'NODE_SEA_BLOB', await fs.promises.readFile(blobPath), {
@@ -328,8 +329,8 @@ async function createSeaLauncher({ executablePath, appDir, target, productName,
   } else {
     await fs.promises.chmod(executablePath, 0o755);
   }
-  if (target === 'macos' && commandExists('codesign', ['--version'])) {
-    await run('codesign', ['--force', '--sign', '-', executablePath]);
+  if (target === 'macos' && hasMacCodeSigningTool()) {
+    await run('/usr/bin/codesign', ['--force', '--sign', '-', executablePath]);
   }
   await fse.remove(work);
 }
@@ -367,23 +368,36 @@ function readPortableExecutableLayout(image) {
   }
 
   const peOffset = image.readUInt32LE(0x3c);
-  if (peOffset < 0x40 || peOffset + 0x100 > image.length || image.toString('ascii', peOffset, peOffset + 4) !== 'PE\\0\\0') {
+  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 optionalHeaderOffset = peOffset + 24;
+  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: optionalHeaderOffset + (magic === 0x20b ? 112 : 96)
+    dataDirectoryOffset
   };
 }
 
-function createEmbeddedLauncherSource(productName) {
+function createEmbeddedLauncherSource(productName, appId) {
   return `
 'use strict';
 const path = require('node:path');
@@ -396,6 +410,7 @@ const { pathToFileURL } = require('node:url');
 const { getAsset } = require('node:sea');
 
 const productName = ${JSON.stringify(productName)};
+const appId = ${JSON.stringify(appId || 'com.atomjs.app')};
 const payload = Buffer.from(getAsset('atom-app'));
 const payloadHash = crypto.createHash('sha256').update(payload).digest('hex').slice(0, 24);
 const dataRoot = process.platform === 'darwin'
@@ -435,10 +450,16 @@ if (!fs.existsSync(packagePath)) throw new Error('AtomJS could not materialize t
 const executableDir = path.dirname(process.execPath);
 process.chdir(appDir);
 process.env.ATOM_PROJECT_ROOT = appDir;
+process.env.ATOM_APP_NAME = productName;
+process.env.ATOM_APP_ID = appId;
 process.env.ATOM_BUILD = '1';
 process.env.ATOM_EMBEDDED_RUNTIME = '1';
 process.env.ATOM_WINDOW_HOST_ENTRY = path.join(appDir, 'vendor', 'atomjs', 'src', 'runtime', 'window-host.mjs');
 process.env.ATOM_MACOS_HOST_EXECUTABLE = path.join(executableDir, 'AtomJSWindowHost');
+const bundledMacIcon = path.join(executableDir, '..', 'Resources', 'AppIcon.icns');
+if (process.platform === 'darwin' && fs.existsSync(bundledMacIcon)) {
+  process.env.ATOM_APP_ICON = bundledMacIcon;
+}
 const hostModeIndex = process.argv.indexOf('--atomjs-window-host');
 if (hostModeIndex !== -1) {
   const hostEntry = process.env.ATOM_WINDOW_HOST_ENTRY;
@@ -545,6 +566,10 @@ function resolveNsisExecutable() {
   return candidates.find((candidate) => fs.existsSync(candidate)) || null;
 }
 
+function hasMacCodeSigningTool() {
+  return process.platform === 'darwin' && fs.existsSync('/usr/bin/codesign');
+}
+
 async function packageMacOS({ project, buildRoot, unpacked, executableName, productName, hostSource }) {
   const outputs = [];
   const appBundle = path.join(buildRoot, `${productName}.app`);
@@ -609,7 +634,7 @@ ${iconEntry}
     await run('/usr/bin/plutil', ['-lint', plistPath]);
   }
 
-  if (commandExists('/usr/bin/codesign', ['--version'])) {
+  if (hasMacCodeSigningTool()) {
     await run('/usr/bin/codesign', ['--force', '--sign', '-', nativeHost]);
     await run('/usr/bin/codesign', ['--force', '--sign', '-', mainExecutable]);
     await run('/usr/bin/codesign', ['--force', '--deep', '--sign', '-', appBundle]);
@@ -783,4 +808,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

@@ -19,7 +19,7 @@ async function doctorCommand(options = {}) {
     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'])));
     rows.push(check('WebKit framework', fs.existsSync('/System/Library/Frameworks/WebKit.framework')));
-    rows.push(check('codesign', commandExists('/usr/bin/codesign', ['--version'])));
+    rows.push(check('codesign', fs.existsSync('/usr/bin/codesign'), '/usr/bin/codesign'));
     rows.push(check('hdiutil', commandExists('hdiutil', ['help'])));
   } else {
     rows.push(check('pkg-config', commandExists('pkg-config', ['--version'])));

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.3-alpha.0',
+      electron: 'npm:@atom-js-org/electron@0.4.3-alpha.0'
     },
     optionalDependencies: {
       'webview-nodejs': '0.5.0'
     },
     devDependencies: {
-      '@atom-js-org/cli': '0.3.0-alpha.0'
+      '@atom-js-org/cli': '0.4.3-alpha.0'
     },
     overrides: {
       tar: '7.5.20'

package/src/run.cjs

@@ -23,11 +23,17 @@ async function runDev(options) {
 
   await ensureElectronCompatibility(project.root);
 
+  const iconPath = project.config.icon
+    ? path.resolve(project.root, project.config.icon)
+    : null;
   const child = spawn(process.execPath, [mainPath], {
     cwd: project.root,
     env: {
       ...process.env,
       ATOM_PROJECT_ROOT: project.root,
+      ATOM_APP_NAME: project.config.productName,
+      ATOM_APP_ID: project.config.appId,
+      ...(iconPath && fs.existsSync(iconPath) ? { ATOM_APP_ICON: iconPath } : {}),
       ATOM_DEV: '1'
     },
     stdio: 'inherit'