bare-build 0.2.7 → 0.2.8

package/CMakeLists.txt

@@ -55,7 +55,6 @@ target_link_libraries(
   PUBLIC
     $<LINK_LIBRARY:WHOLE_ARCHIVE,bare_static>
   PRIVATE
-    log_static
     rlimit_static
     path_static
 )

package/README.md

@@ -1,6 +1,6 @@
 # bare-build
 
-Application builder for Bare.
+Application builder for Bare that allows developers to package their JavaScript code as either native application bundles or standalone executables for both desktop and mobile.
 
 ```
 npm i [-g] bare-build
@@ -29,6 +29,16 @@ bare-build \
   app.js
 ```
 
+## Formats
+
+| Platform | Unpackaged                 | `--package` | `--standalone`                                                |
+| :------- | :------------------------- | :---------- | :------------------------------------------------------------ |
+| Linux    | `.AppDir`, Snap compatible | `.AppImage` | ELF executable with self-extracting `.so` libraries           |
+| Android  | `.apk`                     | `.aab`      | ELF executable with self-extracting `.so` libraries           |
+| macOS    | `.app`                     | `.pkg`      | Mach-O executable with self-extracting `.framework` libraries |
+| iOS      | `.app`                     | `.pkg`      | Mach-O executable with self-extracting `.framework` libraries |
+| Windows  | Plain directory            | `.msix`     | PE executable with self-extracting `.dll` libraries           |
+
 ## API
 
 #### `for await (const resource of build(entry[, preflight][, options]))`

package/lib/platform/android/create-apk.js

@@ -0,0 +1,13 @@
+const path = require('path')
+
+module.exports = async function* createAPK(aab, out, opts = {}) {
+  const { createAPK } = require('bare-apk') // Optional
+
+  const { name } = opts
+
+  const apk = path.join(out, name + '.apk')
+  await createAPK(aab, apk, opts)
+  yield apk
+
+  return apk
+}

package/lib/platform/android/create-app-bundle.js

@@ -0,0 +1,130 @@
+const path = require('path')
+const link = require('bare-link')
+const fs = require('../../fs')
+const prebuilds = require('../../prebuilds')
+
+module.exports = async function* createAppBundle(base, bundle, hosts, out, opts = {}) {
+  const { createAppBundle, constants } = require('bare-apk') // Optional
+
+  const {
+    name,
+    identifier = toIdentifier(name),
+    minimumSDK = constants.DEFAULT_MINIMUM_SDK,
+    targetSDK = constants.DEFAULT_TARGET_SDK,
+    runtime = { prebuilds }
+  } = opts
+
+  const archs = new Map()
+
+  for (const host of hosts) {
+    let arch
+
+    switch (host) {
+      case 'android-arm64':
+        arch = 'arm64-v8a'
+        break
+      case 'android-arm':
+        arch = 'armeabi-v7a'
+        break
+      case 'android-ia32':
+        arch = 'x86'
+        break
+      case 'android-x64':
+        arch = 'x86_64'
+        break
+      default:
+        throw new Error(`Unknown host '${host}'`)
+    }
+
+    archs.set(arch, host)
+  }
+
+  const temp = []
+
+  try {
+    const build = await fs.tempDir()
+
+    temp.push(build)
+
+    const lib = path.join(build, 'lib')
+    await fs.makeDir(lib)
+
+    const assets = path.join(build, 'assets')
+    await fs.makeDir(assets)
+
+    const classes = path.join(build, 'dex')
+    await fs.makeDir(classes)
+
+    yield* link(base, { ...opts, hosts, out: lib })
+
+    for (const [arch, host] of archs) {
+      const prebuild = runtime.prebuilds[host]()
+
+      try {
+        for await (const file of await fs.openDir(
+          path.resolve(prebuild, '..', path.basename(prebuild, '.so').replace(/^lib/, ''))
+        )) {
+          switch (path.extname(file.name)) {
+            case '.so': {
+              const so = path.join(lib, arch, file.name)
+              await fs.copyFile(path.join(file.parentPath, file.name), so)
+              yield so
+              break
+            }
+            case '.dex': {
+              const dex = path.join(classes, file.name)
+              await fs.copyFile(path.join(file.parentPath, file.name), dex)
+              yield dex
+              break
+            }
+          }
+        }
+      } catch (err) {
+        if (err.code !== 'ENOENT' && err.code !== 'ENOTDIR') throw err
+      }
+
+      const so = path.join(lib, arch, path.basename(prebuild))
+      await fs.copyFile(prebuild, so)
+      yield so
+    }
+
+    const appBundle = path.join(assets, 'app.bundle')
+    await fs.writeFile(appBundle, bundle.toBuffer())
+    yield appBundle
+
+    const appManifest = path.join(build, 'AndroidManifest.xml')
+    await fs.writeFile(appManifest, createAndroidManifest(name, identifier, minimumSDK, targetSDK))
+    yield appManifest
+
+    const aab = path.join(out, name + '.aab')
+    await createAppBundle(appManifest, aab, { include: [lib, assets, classes] })
+    yield aab
+
+    return aab
+  } finally {
+    for (const dir of temp) await fs.rm(dir)
+  }
+}
+
+function createAndroidManifest(name, identifier, minimumSDK, targetSDK) {
+  return `\
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="${identifier}">
+  <uses-sdk android:minSdkVersion="${minimumSDK}" android:targetSdkVersion="${targetSDK}" />
+  <uses-permission android:name="android.permission.INTERNET" />
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+  <application android:label="${name}" android:hasCode="true" android:usesCleartextTraffic="true">
+    <activity android:name="to.holepunch.bare.Activity" android:exported="true">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+    </activity>
+  </application>
+</manifest>
+`
+}
+
+function toIdentifier(input) {
+  return input.replace(/[^a-z0-9_]+/gi, '_')
+}

package/lib/platform/android.js

@@ -1,52 +1,56 @@
 const path = require('path')
-const link = require('bare-link')
 const fs = require('../fs')
-const prebuilds = require('../prebuilds')
+const createAppBundle = require('./android/create-app-bundle')
+const createAPK = require('./android/create-apk')
+const createExecutable = require('./linux/create-executable')
 
 module.exports = async function* android(base, bundle, preflight, opts = {}) {
-  const { createAppBundle, createAPK, constants } = require('bare-apk') // Optional
-
-  const {
-    hosts = [],
-    name,
-    identifier = toIdentifier(name),
-    minimumSDK = constants.DEFAULT_MINIMUM_SDK,
-    targetSDK = constants.DEFAULT_TARGET_SDK,
-    runtime = { prebuilds },
-    standalone = false,
-    package = false,
-    out = '.'
-  } = opts
+  const { hosts = [], standalone = false, package = false, out = '.' } = opts
 
   if (standalone) {
-    throw new Error('Standalone mode is not supported for Android')
-  }
+    const archs = new Map()
+
+    for (const host of hosts) {
+      let arch
+
+      switch (host) {
+        case 'android-arm64':
+          arch = 'arm64-v8a'
+          break
+        case 'android-arm':
+          arch = 'armeabi-v7a'
+          break
+        case 'android-ia32':
+          arch = 'x86'
+          break
+        case 'android-x64':
+          arch = 'x86_64'
+          break
+        default:
+          throw new Error(`Unknown host '${host}'`)
+      }
 
-  const archs = new Map()
+      archs.set(arch, host)
+    }
 
-  for (const host of hosts) {
-    let arch
+    const result = []
 
-    switch (host) {
-      case 'android-arm64':
-        arch = 'arm64-v8a'
-        break
-      case 'android-arm':
-        arch = 'armeabi-v7a'
-        break
-      case 'android-ia32':
-        arch = 'x86'
-        break
-      case 'android-x64':
-        arch = 'x86_64'
-        break
-      default:
-        throw new Error(`Unknown host '${host}'`)
+    for (const [arch, host] of archs) {
+      result.push(
+        yield* createExecutable(
+          bundle,
+          host,
+          archs.size === 1 ? path.resolve(out) : path.resolve(out, arch),
+          opts
+        )
+      )
     }
 
-    archs.set(arch, host)
+    return result
   }
 
+  if (package) return [yield* createAppBundle(base, bundle, hosts, out, opts)]
+
   const temp = []
 
   try {
@@ -54,91 +58,10 @@ module.exports = async function* android(base, bundle, preflight, opts = {}) {
 
     temp.push(build)
 
-    const lib = path.join(build, 'lib')
-    await fs.makeDir(lib)
-
-    const assets = path.join(build, 'assets')
-    await fs.makeDir(assets)
-
-    const classes = path.join(build, 'dex')
-    await fs.makeDir(classes)
-
-    yield* link(base, { ...opts, hosts, out: lib })
-
-    for (const [arch, host] of archs) {
-      const prebuild = runtime.prebuilds[host]()
-
-      try {
-        for await (const file of await fs.openDir(
-          path.resolve(prebuild, '..', path.basename(prebuild, '.so').replace(/^lib/, ''))
-        )) {
-          switch (path.extname(file.name)) {
-            case '.so': {
-              const so = path.join(lib, arch, file.name)
-              await fs.copyFile(path.join(file.parentPath, file.name), so)
-              yield so
-              break
-            }
-            case '.dex': {
-              const dex = path.join(classes, file.name)
-              await fs.copyFile(path.join(file.parentPath, file.name), dex)
-              yield dex
-              break
-            }
-          }
-        }
-      } catch (err) {
-        if (err.code !== 'ENOENT') throw err
-      }
-
-      const so = path.join(lib, arch, path.basename(prebuild))
-      await fs.copyFile(prebuild, so)
-      yield so
-    }
-
-    const appBundle = path.join(assets, 'app.bundle')
-    await fs.writeFile(appBundle, bundle.toBuffer())
-    yield appBundle
-
-    const appManifest = path.join(build, 'AndroidManifest.xml')
-    await fs.writeFile(appManifest, createAndroidManifest(name, identifier, minimumSDK, targetSDK))
-    yield appManifest
-
-    const aab = path.join(package ? out : build, name + '.aab')
-    await createAppBundle(appManifest, aab, { include: [lib, assets, classes] })
-    yield aab
+    const aab = yield* createAppBundle(base, bundle, hosts, build, opts)
 
-    if (package) return [aab]
-
-    const apk = path.join(out, name + '.apk')
-    await createAPK(aab, apk, opts)
-    yield apk
-
-    return [apk]
+    return [yield* createAPK(aab, out, opts)]
   } finally {
     for (const dir of temp) await fs.rm(dir)
   }
 }
-
-function createAndroidManifest(name, identifier, minimumSDK, targetSDK) {
-  return `\
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="${identifier}">
-  <uses-sdk android:minSdkVersion="${minimumSDK}" android:targetSdkVersion="${targetSDK}" />
-  <uses-permission android:name="android.permission.INTERNET" />
-  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-  <application android:label="${name}" android:hasCode="true" android:usesCleartextTraffic="true">
-    <activity android:name="to.holepunch.bare.Activity" android:exported="true">
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.LAUNCHER" />
-      </intent-filter>
-    </activity>
-  </application>
-</manifest>
-`
-}
-
-function toIdentifier(input) {
-  return input.replace(/[^a-z0-9_]+/gi, '_')
-}

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

@@ -10,30 +10,26 @@ module.exports = async function* createExecutable(bundle, host, out, opts = {})
 
   const binary = new ELF.Binary(await fs.readFile(runtime.prebuilds[host]()))
 
-  let section = new ELF.Section('.bare')
+  let segment = new ELF.Segment()
 
-  section.flags = ELF.Section.FLAGS.ALLOC
-  section.content = bundle.toBuffer()
+  segment.type = ELF.Segment.TYPE.LOAD
+  segment.flags = ELF.Segment.FLAGS.R
+  segment.content = bundle.toBuffer()
 
-  section = binary.addSection(section)
+  segment = binary.addSegment(segment)
 
-  const sectionIndex = binary.getSectionIndex('.bare')
+  const sectionIndex = binary.getSectionIndex('.dynsym')
 
-  const begin = new ELF.Symbol('__bare_bundle_begin')
+  const begin = binary.getDynamicSymbol('__bare_bundle_begin')
 
-  begin.value = section.virtualAddress
-  begin.binding = ELF.Symbol.BINDING.GLOBAL
+  begin.value = segment.virtualAddress
   begin.sectionIndex = sectionIndex
 
-  const end = new ELF.Symbol('__bare_bundle_end')
+  const end = binary.getDynamicSymbol('__bare_bundle_end')
 
-  end.value = section.virtualAddress + section.size
-  end.binding = ELF.Symbol.BINDING.GLOBAL
+  end.value = segment.virtualAddress + segment.virtualSize
   end.sectionIndex = sectionIndex
 
-  binary.addDynamicSymbol(begin)
-  binary.addDynamicSymbol(end)
-
   const executable = path.join(out, toIdentifier(name))
   binary.toDisk(executable)
   await fs.chmod(executable, 0o755)

package/lib/platform/windows/create-msix-content-directory.js

@@ -48,7 +48,7 @@ module.exports = async function* createMSIXContentDirectory(
       }
     }
   } catch (err) {
-    if (err.code !== 'ENOENT') throw err
+    if (err.code !== 'ENOENT' && err.code !== 'ENOTDIR') throw err
   }
 
   const binary = new PE.Binary(await fs.readFile(prebuild))

package/lib/prebuilds.js

@@ -1,13 +1,29 @@
 require.asset = require('require-asset')
 
-exports['darwin-x64'] = () => {
-  return require.asset('../prebuilds/darwin-x64/bare', __filename)
+exports['android-arm'] = () => {
+  return require.asset('../prebuilds/android-arm/bare', __filename)
+}
+
+exports['android-arm64'] = () => {
+  return require.asset('../prebuilds/android-arm64/bare', __filename)
+}
+
+exports['android-ia32'] = () => {
+  return require.asset('../prebuilds/android-ia32/bare', __filename)
+}
+
+exports['android-x64'] = () => {
+  return require.asset('../prebuilds/android-x64/bare', __filename)
 }
 
 exports['darwin-arm64'] = () => {
   return require.asset('../prebuilds/darwin-arm64/bare', __filename)
 }
 
+exports['darwin-x64'] = () => {
+  return require.asset('../prebuilds/darwin-x64/bare', __filename)
+}
+
 exports['ios-arm64'] = () => {
   return require.asset('../prebuilds/ios-arm64/bare', __filename)
 }
@@ -20,18 +36,18 @@ exports['ios-x64-simulator'] = () => {
   return require.asset('../prebuilds/ios-x64-simulator/bare', __filename)
 }
 
-exports['linux-x64'] = () => {
-  return require.asset('../prebuilds/linux-x64/bare', __filename)
-}
-
 exports['linux-arm64'] = () => {
   return require.asset('../prebuilds/linux-arm64/bare', __filename)
 }
 
-exports['win32-x64'] = () => {
-  return require.asset('../prebuilds/win32-x64/bare.exe', __filename)
+exports['linux-x64'] = () => {
+  return require.asset('../prebuilds/linux-x64/bare', __filename)
 }
 
 exports['win32-arm64'] = () => {
   return require.asset('../prebuilds/win32-arm64/bare.exe', __filename)
 }
+
+exports['win32-x64'] = () => {
+  return require.asset('../prebuilds/win32-x64/bare.exe', __filename)
+}

package/lib/runtime.c

@@ -1,7 +1,6 @@
 #include <assert.h>
 #include <bare.h>
 #include <js.h>
-#include <log.h>
 #include <path.h>
 #include <rlimit.h>
 #include <signal.h>
@@ -67,9 +66,6 @@ main(int argc, char *argv[]) {
   signal(SIGPIPE, SIG_IGN);
 #endif
 
-  err = log_open("bare", 0);
-  assert(err == 0);
-
   err = rlimit_set(rlimit_open_files, rlimit_infer);
   assert(err == 0);
 
@@ -137,9 +133,11 @@ main(int argc, char *argv[]) {
     err = uv_exepath(bin, &len);
     assert(err == 0);
 
+#if defined(BARE_PLATFORM_LINUX)
     size_t dir;
     err = path_dirname(bin, &dir, path_behavior_system);
     assert(err == 0);
+#endif
 
     char preflight[4096];
     len = 4096;
@@ -147,7 +145,7 @@ main(int argc, char *argv[]) {
     err = path_join(
 #if defined(BARE_PLATFORM_DARWIN) || defined(BARE_PLATFORM_WIN32)
       (const char *[]) {bin, "..", "..", "Resources", "preflight.bundle", NULL},
-#elif defined(BARE_PLATFORM_IOS)
+#elif defined(BARE_PLATFORM_IOS) || defined(BARE_PLATFORM_ANDROID)
       (const char *[]) {bin, "..", "preflight.bundle", NULL},
 #elif defined(BARE_PLATFORM_LINUX)
       (const char *[]) {bin, "..", "..", "share", &bin[dir], "preflight.bundle", NULL},
@@ -184,7 +182,7 @@ main(int argc, char *argv[]) {
     err = path_join(
 #if defined(BARE_PLATFORM_DARWIN) || defined(BARE_PLATFORM_WIN32)
       (const char *[]) {bin, "..", "..", "Resources", "app.bundle", NULL},
-#elif defined(BARE_PLATFORM_IOS)
+#elif defined(BARE_PLATFORM_IOS) || defined(BARE_PLATFORM_ANDROID)
       (const char *[]) {bin, "..", "app.bundle", NULL},
 #elif defined(BARE_PLATFORM_LINUX)
       (const char *[]) {bin, "..", "..", "share", &bin[dir], "app.bundle", NULL},
@@ -217,8 +215,5 @@ main(int argc, char *argv[]) {
 
   uv_thread_join(&thread);
 
-  err = log_close();
-  assert(err == 0);
-
   return exit_code;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-build",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "description": "Application builder for Bare",
   "exports": {
     "./package": "./package.json",
@@ -54,7 +54,7 @@
   "dependencies": {
     "bare-bundle-id": "^1.0.2",
     "bare-fs": "^4.5.1",
-    "bare-lief": "^0.1.1",
+    "bare-lief": "^0.1.3",
     "bare-link": "^2.1.2",
     "bare-module-resolve": "^1.12.0",
     "bare-module-traverse": "^1.8.1",