bare-build 0.2.0 → 0.2.2

package/CMakeLists.txt

@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 4.0)
 
 find_package(cmake-bare REQUIRED PATHS node_modules/cmake-bare)
+find_package(cmake-bare-bundle REQUIRED PATHS node_modules/cmake-bare-bundle)
 find_package(cmake-fetch REQUIRED PATHS node_modules/cmake-fetch)
 
 project(bare_build C)
@@ -8,28 +9,39 @@ project(bare_build C)
 fetch_package("github:holepunchto/bare@1.24.3")
 fetch_package("github:holepunchto/libpath")
 
-add_executable(bare_build)
+add_bare_bundle(
+  bare_runtime_bundle
+  ENTRY lib/runtime.js
+  OUT lib/runtime.bundle.h
+  BUILTINS lib/builtins.json
+)
+
+add_executable(bare_runtime)
 
 target_sources(
-  bare_build
+  bare_runtime
   PRIVATE
     lib/runtime.c
+    lib/runtime.bundle.h
+    lib/runtime/apple.h
+    lib/runtime/linux.h
+    lib/runtime/windows.h
 )
 
 if(APPLE)
-  set(bare_build_rpath "@loader_path/../Frameworks")
+  set(bare_runtime_rpath "@loader_path/../Frameworks")
 elseif(LINUX)
-  set(bare_build_rpath "$ORIGIN/../lib")
+  set(bare_runtime_rpath "$ORIGIN/../lib")
 else()
   set(${target}_rpath "")
 endif()
 
 set_target_properties(
-  bare_build
+  bare_runtime
   PROPERTIES
   OUTPUT_NAME bare
 
-  INSTALL_RPATH "${bare_build_rpath}"
+  INSTALL_RPATH "${bare_runtime_rpath}"
   BUILD_WITH_INSTALL_RPATH ON
 
   ENABLE_EXPORTS ON
@@ -37,7 +49,7 @@ set_target_properties(
 )
 
 target_link_libraries(
-  bare_build
+  bare_runtime
   PUBLIC
     $<LINK_LIBRARY:WHOLE_ARCHIVE,bare_static>
   PRIVATE
@@ -58,18 +70,18 @@ if(WIN32)
   file(GENERATE OUTPUT "runtime.manifest" CONTENT "${manifest}" NEWLINE_STYLE WIN32)
 
   target_sources(
-    bare_build
+    bare_runtime
     PRIVATE
       "${CMAKE_CURRENT_BINARY_DIR}/runtime.manifest"
   )
-
-  target_link_options(
-    bare_build
-    PRIVATE
-      $<$<CONFIG:Release>:/subsystem:windows /entry:mainCRTStartup>
-  )
 endif()
 
+link_bare_module(bare_runtime bare-fs)
+link_bare_module(bare_runtime bare-module)
+link_bare_module(bare_runtime bare-module-lexer)
+link_bare_module(bare_runtime bare-os)
+link_bare_module(bare_runtime bare-url)
+
 bare_target(target)
 
-install(TARGETS bare_build RUNTIME DESTINATION ${target})
+install(TARGETS bare_runtime RUNTIME DESTINATION ${target})

package/README.md

@@ -44,6 +44,7 @@ options = {
   identifier,
   target: [],
   out: '.',
+  standalone: false,
   package: false,
   sign: false,
 
@@ -80,6 +81,7 @@ Flags include:
 --identifier <id>             The unique application identifier
 --target|-t <host>            The host to target
 --out|-o <dir>                The output directory
+--standalone                  Build a standalone executable
 --package                     Package the application for distribution
 --sign                        Sign the application
 --identity <id>               The macOS signing identity

package/bin.js

@@ -16,6 +16,7 @@ const cmd = command(
   flag('--identifier <id>', 'The unique application identifier'),
   flag('--target|-t <host>', 'The host to target').multiple(),
   flag('--out|-o <dir>', 'The output directory'),
+  flag('--standalone', 'Build a standalone executable'),
   flag('--package', 'Package the application for distribution'),
   flag('--sign', 'Sign the application'),
   flag('--identity <id>', 'The macOS signing identity'),
@@ -39,6 +40,7 @@ const cmd = command(
       identifier,
       target,
       out,
+      standalone,
       package,
       sign,
       identity,
@@ -64,6 +66,7 @@ const cmd = command(
         identifier,
         target,
         out,
+        standalone,
         package,
         sign,
         identity,

package/index.js

@@ -3,10 +3,10 @@ const { pathToFileURL } = require('url')
 const { resolve } = require('bare-module-traverse')
 const id = require('bare-bundle-id')
 const pack = require('bare-pack')
-const fs = require('bare-pack/fs')
+const { readModule, listPrefix } = require('bare-pack/fs')
 
 module.exports = async function* build(entry, opts = {}) {
-  const { base = '.', target = [], hosts = target } = opts
+  const { base = '.', target = [], hosts = target, standalone = false } = opts
 
   let pkg
   try {
@@ -19,11 +19,11 @@ module.exports = async function* build(entry, opts = {}) {
     pathToFileURL(entry),
     {
       hosts,
-      linked: true,
+      linked: standalone === false,
       resolve: resolve.bare
     },
-    fs.readModule,
-    fs.listPrefix
+    readModule,
+    listPrefix
   )
 
   bundle = bundle.unmount(pathToFileURL(base))

package/lib/assets.js

@@ -0,0 +1,13 @@
+require.asset = require('require-asset')
+
+module.exports = {
+  apple: {
+    icon: require.asset('./assets/apple/icon.png', __filename)
+  },
+  linux: {
+    icon: require.asset('./assets/linux/icon.png', __filename)
+  },
+  windows: {
+    icon: require.asset('./assets/windows/icon.png', __filename)
+  }
+}

package/lib/builtins.json

@@ -0,0 +1,7 @@
+[
+  { "addon": "bare-fs" },
+  { "addon": "bare-module" },
+  { "addon": "bare-module-lexer" },
+  { "addon": "bare-os" },
+  { "addon": "bare-url" }
+]

package/lib/fs.js

@@ -54,9 +54,9 @@ exports.writeFile = async function writeFile(name, data) {
 }
 
 exports.readFile = async function readFile(name) {
-  return new Promise((resolve) => {
+  return new Promise((resolve, reject) => {
     fs.readFile(name, (err, data) => {
-      resolve(err ? null : data)
+      err ? reject(err) : resolve(data)
     })
   })
 }

package/lib/platform/apple/create-app.js

@@ -4,15 +4,16 @@ const unpack = require('bare-unpack')
 const { MachO } = require('bare-lief')
 const fs = require('../../fs')
 const prebuilds = require('../../prebuilds')
+const { apple } = require('../../assets')
 const sign = require('./sign')
 const toIdentifier = require('./to-identifier')
 
 // https://developer.apple.com/documentation/bundleresources/placing-content-in-a-bundle
 module.exports = async function* createApp(base, pkg, bundle, hosts, out, opts = {}) {
   const {
-    name = pkg.name,
-    version = pkg.version,
-    icon,
+    name = pkg.name || 'App',
+    version = pkg.version || '1.0.0',
+    icon = apple.icon,
     identity,
     applicationIdentity = identity
   } = opts
@@ -32,11 +33,7 @@ module.exports = async function* createApp(base, pkg, bundle, hosts, out, opts =
 
   const frameworks = path.join(main, 'Frameworks')
 
-  const executable = isMac ? path.join(main, 'MacOS', name) : path.join(main, name)
-
-  if (isMac) {
-    await fs.makeDir(path.join(main, 'MacOS'))
-  }
+  if (isMac) await fs.makeDir(path.join(main, 'MacOS'))
 
   yield* link(base, { ...opts, hosts, identity: applicationIdentity, out: frameworks })
 
@@ -48,6 +45,7 @@ module.exports = async function* createApp(base, pkg, bundle, hosts, out, opts =
 
   const fat = MachO.FatBinary.merge(binaries)
 
+  const executable = isMac ? path.join(main, 'MacOS', name) : path.join(main, name)
   fat.toDisk(executable)
   await fs.chmod(executable, 0o755)
   await sign(executable, opts)

package/lib/platform/apple/create-executable.js

@@ -0,0 +1,60 @@
+const path = require('path')
+const { MachO } = require('bare-lief')
+const fs = require('../../fs')
+const prebuilds = require('../../prebuilds')
+const sign = require('./sign')
+
+module.exports = async function* createExecutable(pkg, bundle, hosts, out, opts = {}) {
+  const { name = pkg.name || 'App' } = opts
+
+  await fs.makeDir(out)
+
+  const temp = await fs.tempDir()
+  try {
+    for (const addon of bundle.addons) {
+      const target = path.join(temp, addon)
+      await fs.makeDir(path.dirname(target))
+      await fs.writeFile(target, bundle.read(addon))
+      await sign(target, opts)
+
+      bundle.write(addon, await fs.readFile(target))
+    }
+  } finally {
+    await fs.rm(temp)
+  }
+
+  const inputs = hosts.map((host) => prebuilds[host]())
+
+  const binaries = []
+
+  for (const input of inputs) binaries.push(new MachO.FatBinary(await fs.readFile(input)))
+
+  const fat = MachO.FatBinary.merge(binaries)
+
+  const section = new MachO.Section('__bundle', bundle.toBuffer())
+
+  const segment = new MachO.SegmentCommand('__BARE')
+
+  segment.maxProtection = segment.initialProtection = MachO.SegmentCommand.VM_PROTECTIONS.READ
+
+  segment.addSection(section)
+
+  for (const binary of fat) {
+    binary.addSegmentCommand(segment)
+  }
+
+  const executable = path.join(out, toIdentifier(name))
+  fat.toDisk(executable)
+  await fs.chmod(executable, 0o755)
+  await sign(executable, opts)
+  yield executable
+
+  return executable
+}
+
+function toIdentifier(input) {
+  return input
+    .replace(/[^a-z0-9]+/gi, '-')
+    .replace(/([a-z0-9])([A-Z])/g, '$1-$2')
+    .toLowerCase()
+}

package/lib/platform/apple/create-package-component.js

@@ -10,8 +10,8 @@ module.exports = async function* createPackageComponent(pkg, root, id, opts = {}
   }
 
   let {
-    name = pkg.name,
-    version = pkg.version,
+    name = pkg.name || 'App',
+    version = pkg.version || '1.0.0',
     identifier = toIdentifier(name),
     sign = false,
     identity = 'Apple Development',

package/lib/platform/apple/create-package.js

@@ -4,8 +4,8 @@ const run = require('../../run')
 
 module.exports = async function* createPackage(pkg, root, components, out, opts = {}) {
   const {
-    name = pkg.name,
-    version = pkg.version,
+    name = pkg.name || 'App',
+    version = pkg.version || '1.0.0',
     sign = false,
     identity = 'Apple Development',
     installerIdentity = identity,

package/lib/platform/apple/sign.js

@@ -1,4 +1,5 @@
 const path = require('path')
+const fs = require('../../fs')
 const run = require('../../run')
 
 module.exports = async function sign(resource, opts = {}) {
@@ -11,17 +12,65 @@ module.exports = async function sign(resource, opts = {}) {
     hardenedRuntime = false
   } = opts
 
-  if (sign) {
-    const args = ['--timestamp', '--force', '--sign', applicationIdentity]
+  const temp = []
 
-    if (keychain) args.push('--keychain', keychain)
-    if (entitlements) args.push('--entitlements', path.resolve(entitlements))
-    if (hardenedRuntime) args.push('--options', 'runtime')
+  try {
+    if (sign) {
+      const args = ['--timestamp', '--force', '--sign', applicationIdentity]
 
-    args.push(resource)
+      if (keychain) args.push('--keychain', keychain)
 
-    await run('codesign', args)
-  } else {
-    await run('codesign', ['--timestamp=none', '--force', '--sign', '-', resource])
+      if (entitlements) args.push('--entitlements', path.resolve(entitlements))
+      else {
+        const out = await fs.tempDir()
+
+        temp.push(out)
+
+        const entitlements = path.join(out, 'Entitlements.plist')
+
+        await fs.writeFile(entitlements, createEntitlements(opts))
+
+        args.push('--entitlements', entitlements)
+      }
+
+      if (hardenedRuntime) args.push('--options', 'runtime')
+
+      args.push(resource)
+
+      await run('codesign', args)
+    } else {
+      await run('codesign', ['--timestamp=none', '--force', '--sign', '-', resource])
+    }
+  } finally {
+    for (const dir of temp) await fs.rm(dir)
   }
 }
+
+function createEntitlements(opts = {}) {
+  const { hardenedRuntime = false } = opts
+
+  const entitlements = []
+
+  if (hardenedRuntime) {
+    entitlements.push(
+      'com.apple.security.cs.allow-jit',
+      'com.apple.security.cs.allow-unsigned-executable-memory'
+    )
+  }
+
+  return `\
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>${entitlements
+    .map(
+      (entitlement) => `
+  <key>${entitlement}</key>
+  <true/>
+`
+    )
+    .join('\n')}
+</dict>
+</plist>
+`
+}

package/lib/platform/apple.js

@@ -1,11 +1,12 @@
 const path = require('path')
 const fs = require('../fs')
 const createApp = require('./apple/create-app')
+const createExecutable = require('./apple/create-executable')
 const createPackage = require('./apple/create-package')
 const createPackageComponent = require('./apple/create-package-component')
 
 module.exports = async function* apple(base, pkg, bundle, opts = {}) {
-  const { hosts = [], package = false, out = '.' } = opts
+  const { hosts = [], standalone = false, package = false, out = '.' } = opts
 
   const archs = new Map([
     ['macos', []],
@@ -55,16 +56,28 @@ module.exports = async function* apple(base, pkg, bundle, opts = {}) {
 
         yield* createApp(base, pkg, bundle, hosts, path.join(root, 'Applications'), opts)
       } else {
-        const app = yield* createApp(
-          base,
-          pkg,
-          bundle,
-          hosts,
-          archs.size === 1 ? path.resolve(out) : path.resolve(out, os),
-          opts
-        )
-
-        result.push(app)
+        if (standalone) {
+          result.push(
+            yield* createExecutable(
+              pkg,
+              bundle,
+              hosts,
+              archs.size === 1 ? path.resolve(out) : path.resolve(out, os),
+              opts
+            )
+          )
+        } else {
+          result.push(
+            yield* createApp(
+              base,
+              pkg,
+              bundle,
+              hosts,
+              archs.size === 1 ? path.resolve(out) : path.resolve(out, os),
+              opts
+            )
+          )
+        }
 
         continue
       }

package/lib/platform/linux/create-app-dir.js

@@ -3,10 +3,11 @@ const link = require('bare-link')
 const unpack = require('bare-unpack')
 const fs = require('../../fs')
 const prebuilds = require('../../prebuilds')
+const { linux } = require('../../assets')
 
 // https://docs.appimage.org/packaging-guide/manual.html#creating-an-appdir-manually
 module.exports = async function* createAppDir(base, pkg, bundle, host, out, opts = {}) {
-  const { name = pkg.name, icon } = opts
+  const { name = pkg.name || 'App', icon = linux.icon } = opts
 
   const app = path.resolve(out, name + '.AppDir')
 

package/lib/platform/linux/create-app-image.js

@@ -4,7 +4,7 @@ const path = require('path')
 module.exports = async function* createAppImage(pkg, appDir, out, opts = {}) {
   const createAppImage = require('bare-app-image') // Optional
 
-  const { name = pkg.name, sign = false, key } = opts
+  const { name = pkg.name || 'App', sign = false, key } = opts
 
   const appImage = path.resolve(out, name + '.AppImage')
 

package/lib/platform/linux/create-executable.js

@@ -0,0 +1,50 @@
+const path = require('path')
+const { ELF } = require('bare-lief')
+const fs = require('../../fs')
+const prebuilds = require('../../prebuilds')
+
+module.exports = async function* createExecutable(pkg, bundle, host, out, opts = {}) {
+  const { name = pkg.name || 'App' } = opts
+
+  await fs.makeDir(out)
+
+  const binary = new ELF.Binary(await fs.readFile(prebuilds[host]()))
+
+  let section = new ELF.Section('.bare')
+
+  section.flags = ELF.Section.FLAGS.ALLOC
+  section.content = bundle.toBuffer()
+
+  section = binary.addSection(section)
+
+  const sectionIndex = binary.getSectionIndex('.bare')
+
+  const begin = new ELF.Symbol('__bare_bundle_begin')
+
+  begin.value = section.virtualAddress
+  begin.binding = ELF.Symbol.BINDING.GLOBAL
+  begin.sectionIndex = sectionIndex
+
+  const end = new ELF.Symbol('__bare_bundle_end')
+
+  end.value = section.virtualAddress + section.size
+  end.binding = ELF.Symbol.BINDING.GLOBAL
+  end.sectionIndex = sectionIndex
+
+  binary.addDynamicSymbol(begin)
+  binary.addDynamicSymbol(end)
+
+  const executable = path.join(out, toIdentifier(name))
+  binary.toDisk(executable)
+  await fs.chmod(executable, 0o755)
+  yield executable
+
+  return executable
+}
+
+function toIdentifier(input) {
+  return input
+    .replace(/[^a-z0-9]+/gi, '-')
+    .replace(/([a-z0-9])([A-Z])/g, '$1-$2')
+    .toLowerCase()
+}

package/lib/platform/linux.js

@@ -2,9 +2,10 @@ const path = require('path')
 const fs = require('../fs')
 const createAppDir = require('./linux/create-app-dir')
 const createAppImage = require('./linux/create-app-image')
+const createExecutable = require('./linux/create-executable')
 
 module.exports = exports = async function* linux(base, pkg, bundle, opts = {}) {
-  const { hosts = [], package = false, out = '.' } = opts
+  const { hosts = [], standalone = false, package = false, out = '.' } = opts
 
   const archs = new Map()
 
@@ -39,16 +40,28 @@ module.exports = exports = async function* linux(base, pkg, bundle, opts = {}) {
 
         appDir = yield* createAppDir(base, pkg, bundle, host, out, opts)
       } else {
-        appDir = yield* createAppDir(
-          base,
-          pkg,
-          bundle,
-          host,
-          archs.size === 1 ? path.resolve(out) : path.resolve(out, arch),
-          opts
-        )
-
-        result.push(appDir)
+        if (standalone) {
+          result.push(
+            yield* createExecutable(
+              pkg,
+              bundle,
+              host,
+              archs.size === 1 ? path.resolve(out) : path.resolve(out, arch),
+              opts
+            )
+          )
+        } else {
+          result.push(
+            yield* createAppDir(
+              base,
+              pkg,
+              bundle,
+              host,
+              archs.size === 1 ? path.resolve(out) : path.resolve(out, arch),
+              opts
+            )
+          )
+        }
 
         continue
       }

package/lib/platform/windows/create-executable.js

@@ -0,0 +1,50 @@
+const path = require('path')
+const { PE } = require('bare-lief')
+const fs = require('../../fs')
+const prebuilds = require('../../prebuilds')
+const sign = require('./sign')
+
+module.exports = async function* createExecutable(pkg, bundle, host, out, opts = {}) {
+  const { name = pkg.name || 'App' } = opts
+
+  await fs.makeDir(out)
+
+  const temp = await fs.tempDir()
+  try {
+    for (const addon of bundle.addons) {
+      const target = path.join(temp, addon)
+      await fs.makeDir(path.dirname(target))
+      await fs.writeFile(target, bundle.read(addon))
+      await sign(target, opts)
+
+      bundle.write(addon, await fs.readFile(target))
+    }
+  } finally {
+    await fs.rm(temp)
+  }
+
+  const binary = new PE.Binary(await fs.readFile(prebuilds[host]()))
+
+  binary.optionalHeader.subsystem = PE.OptionalHeader.SUBSYSTEM.WINDOWS_CUI
+
+  let section = new PE.Section('.bare')
+
+  section.characteristics =
+    PE.Section.CHARACTERISTICS.MEM_READ | PE.Section.CHARACTERISTICS.CNT_INITIALIZED_DATA
+  section.content = bundle.toBuffer()
+
+  binary.addSection(section)
+
+  const executable = path.join(out, toIdentifier(name) + '.exe')
+  binary.toDisk(executable)
+  yield executable
+
+  return executable
+}
+
+function toIdentifier(input) {
+  return input
+    .replace(/[^a-z0-9]+/gi, '-')
+    .replace(/([a-z0-9])([A-Z])/g, '$1-$2')
+    .toLowerCase()
+}