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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atom-js-org/cli",
-  "version": "0.4.2-alpha.0",
+  "version": "0.4.4-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.4.2-alpha.0',
+      atomjsVersion: '0.4.4-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);
 }
@@ -396,7 +397,7 @@ function readPortableExecutableLayout(image) {
   };
 }
 
-function createEmbeddedLauncherSource(productName) {
+function createEmbeddedLauncherSource(productName, appId) {
   return `
 'use strict';
 const path = require('node:path');
@@ -409,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'
@@ -448,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;
@@ -558,50 +566,105 @@ function resolveNsisExecutable() {
   return candidates.find((candidate) => fs.existsSync(candidate)) || null;
 }
 
+function hasMacCodeSigningTool() {
+  return process.platform === 'darwin' && fs.existsSync('/usr/bin/codesign');
+}
+
+async function removeMacMetadataFiles(root) {
+  const removed = [];
+  if (!root || !fs.existsSync(root)) return removed;
+
+  async function visit(directory) {
+    const entries = await fs.promises.readdir(directory, { withFileTypes: true });
+    for (const entry of entries) {
+      const absolute = path.join(directory, entry.name);
+      const isMetadata = entry.name === '.DS_Store'
+        || entry.name === '__MACOSX'
+        || entry.name.startsWith('._');
+
+      if (isMetadata) {
+        await fs.promises.rm(absolute, { recursive: true, force: true });
+        removed.push(absolute);
+        continue;
+      }
+
+      if (entry.isDirectory()) await visit(absolute);
+    }
+  }
+
+  await visit(root);
+  return removed;
+}
+
+async function sanitizeMacBundle(appBundle) {
+  await removeMacMetadataFiles(appBundle);
+
+  if (process.platform === 'darwin' && fs.existsSync('/usr/bin/xattr')) {
+    const result = spawnSync('/usr/bin/xattr', ['-cr', appBundle], {
+      encoding: 'utf8',
+      stdio: ['ignore', 'pipe', 'pipe']
+    });
+    if (result.error) {
+      console.warn(`AtomJS could not clear macOS extended attributes: ${result.error.message}`);
+    } else if (result.status !== 0) {
+      const detail = String(result.stderr || result.stdout || '').trim();
+      if (detail) console.warn(`AtomJS could not clear every macOS extended attribute: ${detail}`);
+    }
+  }
+
+  // Filesystems such as exFAT can materialize extended attributes as AppleDouble
+  // sidecars while xattr is running, so remove metadata once more afterwards.
+  await removeMacMetadataFiles(appBundle);
+}
+
 async function packageMacOS({ project, buildRoot, unpacked, executableName, productName, hostSource }) {
   const outputs = [];
-  const appBundle = path.join(buildRoot, `${productName}.app`);
+  const finalAppBundle = path.join(buildRoot, `${productName}.app`);
+  const stageBase = await resolveShortStageBase();
+  const bundleStageRoot = await fs.promises.mkdtemp(path.join(stageBase, 'macos-app-'));
+  const appBundle = path.join(bundleStageRoot, `${productName}.app`);
   const contents = path.join(appBundle, 'Contents');
   const macosDir = path.join(contents, 'MacOS');
   const resources = path.join(contents, 'Resources');
   const mainExecutable = path.join(macosDir, productName);
   const nativeHost = path.join(macosDir, 'AtomJSWindowHost');
 
-  await fse.ensureDir(macosDir);
-  await fse.ensureDir(resources);
-  await fse.copy(path.join(unpacked, executableName), mainExecutable);
-  await fse.copy(path.join(unpacked, 'ATOMJS-CREDIT.txt'), path.join(resources, 'ATOMJS-CREDIT.txt'));
-  await fs.promises.chmod(mainExecutable, 0o755);
-
-  if (!fs.existsSync(hostSource)) {
-    throw new Error(`AtomJS macOS native host source was not found: ${hostSource}`);
-  }
-  if (!commandExists('/usr/bin/xcrun', ['--version'])) {
-    throw new Error('macOS builds require the Xcode Command Line Tools. Run `xcode-select --install`.');
-  }
-
-  await run('/usr/bin/xcrun', [
-    'clang',
-    '-fobjc-arc',
-    '-fmodules',
-    '-mmacosx-version-min=12.0',
-    '-framework', 'Cocoa',
-    '-framework', 'WebKit',
-    hostSource,
-    '-o', nativeHost
-  ]);
-  await fs.promises.chmod(nativeHost, 0o755);
+  try {
+    await fse.ensureDir(macosDir);
+    await fse.ensureDir(resources);
+    await fse.copy(path.join(unpacked, executableName), mainExecutable);
+    await fse.copy(path.join(unpacked, 'ATOMJS-CREDIT.txt'), path.join(resources, 'ATOMJS-CREDIT.txt'));
+    await fs.promises.chmod(mainExecutable, 0o755);
+
+    if (!fs.existsSync(hostSource)) {
+      throw new Error(`AtomJS macOS native host source was not found: ${hostSource}`);
+    }
+    if (!commandExists('/usr/bin/xcrun', ['--version'])) {
+      throw new Error('macOS builds require the Xcode Command Line Tools. Run `xcode-select --install`.');
+    }
 
-  let iconEntry = '';
-  const iconSource = project.config.icon ? path.resolve(project.root, project.config.icon) : null;
-  if (iconSource && fs.existsSync(iconSource) && path.extname(iconSource).toLowerCase() === '.icns') {
-    await fse.copy(iconSource, path.join(resources, 'AppIcon.icns'));
-    iconEntry = '<key>CFBundleIconFile</key><string>AppIcon</string>';
-  }
+    await run('/usr/bin/xcrun', [
+      'clang',
+      '-fobjc-arc',
+      '-fmodules',
+      '-mmacosx-version-min=12.0',
+      '-framework', 'Cocoa',
+      '-framework', 'WebKit',
+      hostSource,
+      '-o', nativeHost
+    ]);
+    await fs.promises.chmod(nativeHost, 0o755);
+
+    let iconEntry = '';
+    const iconSource = project.config.icon ? path.resolve(project.root, project.config.icon) : null;
+    if (iconSource && fs.existsSync(iconSource) && path.extname(iconSource).toLowerCase() === '.icns') {
+      await fse.copy(iconSource, path.join(resources, 'AppIcon.icns'));
+      iconEntry = '<key>CFBundleIconFile</key><string>AppIcon</string>';
+    }
 
-  const version = String(project.packageJson.version || '0.0.0');
-  const bundleVersion = (version.match(/\d+/g) || ['1']).slice(0, 3).join('.');
-  const plist = `<?xml version="1.0" encoding="UTF-8"?>
+    const version = String(project.packageJson.version || '0.0.0');
+    const bundleVersion = (version.match(/\d+/g) || ['1']).slice(0, 3).join('.');
+    const plist = `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0"><dict>
 <key>CFBundleExecutable</key><string>${xml(productName)}</string>
@@ -615,35 +678,64 @@ async function packageMacOS({ project, buildRoot, unpacked, executableName, prod
 <key>NSHighResolutionCapable</key><true/>
 ${iconEntry}
 </dict></plist>`;
-  const plistPath = path.join(contents, 'Info.plist');
-  await fs.promises.writeFile(plistPath, plist, 'utf8');
+    const plistPath = path.join(contents, 'Info.plist');
+    await fs.promises.writeFile(plistPath, plist, 'utf8');
 
-  if (commandExists('/usr/bin/plutil', ['-help'])) {
-    await run('/usr/bin/plutil', ['-lint', plistPath]);
-  }
+    if (commandExists('/usr/bin/plutil', ['-help'])) {
+      await run('/usr/bin/plutil', ['-lint', plistPath]);
+    }
 
-  if (commandExists('/usr/bin/codesign', ['--version'])) {
-    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]);
-    await run('/usr/bin/codesign', ['--verify', '--deep', '--strict', appBundle]);
-  }
+    await sanitizeMacBundle(appBundle);
 
-  const zipPath = path.join(buildRoot, `${productName}-macos.zip`);
-  if (commandExists('ditto', ['-h'])) {
-    await run('ditto', ['-c', '-k', '--sequesterRsrc', '--keepParent', appBundle, zipPath]);
-  } else {
-    await archiveDirectory(appBundle, zipPath, 'zip', `${productName}.app`);
-  }
-  outputs.push(zipPath);
+    if (hasMacCodeSigningTool()) {
+      const signingEnvironment = { ...process.env, COPYFILE_DISABLE: '1' };
+      await run('/usr/bin/codesign', ['--force', '--sign', '-', nativeHost], { env: signingEnvironment });
+      await run('/usr/bin/codesign', ['--force', '--sign', '-', mainExecutable], { env: signingEnvironment });
 
-  if (commandExists('hdiutil', ['help'])) {
-    const dmgPath = path.join(buildRoot, `${productName}.dmg`);
-    await run('hdiutil', ['create', '-volname', productName, '-srcfolder', appBundle, '-ov', '-format', 'UDZO', dmgPath]);
-    outputs.push(dmgPath);
-  }
+      // Signing nested Mach-O files on non-APFS volumes can create fresh `._*`
+      // sidecars. They must not be present when the outer bundle is sealed.
+      await sanitizeMacBundle(appBundle);
+      await run('/usr/bin/codesign', ['--force', '--deep', '--sign', '-', appBundle], { env: signingEnvironment });
+      await run('/usr/bin/codesign', ['--verify', '--deep', '--strict', '--verbose=2', appBundle], { env: signingEnvironment });
+    }
 
-  return { outputs, appBundle };
+    // Assemble and sign on the local temporary filesystem, then copy the sealed
+    // bundle to the project output. This avoids AppleDouble metadata generated by
+    // external/exFAT project drives such as /Volumes/... during codesign.
+    await fse.remove(finalAppBundle);
+    await fse.copy(appBundle, finalAppBundle);
+    await fs.promises.chmod(path.join(finalAppBundle, 'Contents', 'MacOS', productName), 0o755);
+    await fs.promises.chmod(path.join(finalAppBundle, 'Contents', 'MacOS', 'AtomJSWindowHost'), 0o755);
+    await sanitizeMacBundle(finalAppBundle);
+
+    if (hasMacCodeSigningTool()) {
+      await run('/usr/bin/codesign', ['--verify', '--deep', '--strict', '--verbose=2', finalAppBundle], {
+        env: { ...process.env, COPYFILE_DISABLE: '1' }
+      });
+    }
+
+    const zipPath = path.join(buildRoot, `${productName}-macos.zip`);
+    if (commandExists('ditto', ['-h'])) {
+      await run('ditto', ['--norsrc', '-c', '-k', '--keepParent', finalAppBundle, zipPath], {
+        env: { ...process.env, COPYFILE_DISABLE: '1' }
+      });
+    } else {
+      await archiveDirectory(finalAppBundle, zipPath, 'zip', `${productName}.app`);
+    }
+    outputs.push(zipPath);
+
+    if (commandExists('hdiutil', ['help'])) {
+      const dmgPath = path.join(buildRoot, `${productName}.dmg`);
+      await run('hdiutil', ['create', '-volname', productName, '-srcfolder', finalAppBundle, '-ov', '-format', 'UDZO', dmgPath], {
+        env: { ...process.env, COPYFILE_DISABLE: '1' }
+      });
+      outputs.push(dmgPath);
+    }
+
+    return { outputs, appBundle: finalAppBundle };
+  } finally {
+    await fse.remove(bundleStageRoot);
+  }
 }
 
 async function packageLinux({ project, buildRoot, unpacked, executableName, productName }) {
@@ -796,4 +888,4 @@ function xml(value) {
   return String(value).replace(/[<>&'\"]/g, (char) => ({ '<': '&lt;', '>': '&gt;', '&': '&amp;', "'": '&apos;', '"': '&quot;' })[char]);
 }
 
-module.exports = { buildCommand, localBuild, createApplicationPayload, readPortableExecutableLayout };
+module.exports = { buildCommand, localBuild, createApplicationPayload, readPortableExecutableLayout, removeMacMetadataFiles };

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.4.2-alpha.0',
-      electron: 'npm:@atom-js-org/electron@0.4.2-alpha.0'
+      '@atom-js-org/runtime': '0.4.4-alpha.0',
+      electron: 'npm:@atom-js-org/electron@0.4.4-alpha.0'
     },
     optionalDependencies: {
       'webview-nodejs': '0.5.0'
     },
     devDependencies: {
-      '@atom-js-org/cli': '0.4.2-alpha.0'
+      '@atom-js-org/cli': '0.4.4-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'