bare-build 0.2.3 → 0.2.5

package/README.md

@@ -63,7 +63,12 @@ options = {
   thumbprint,
 
   // Linux signing options
-  key
+  key,
+
+  // Android signing options
+  keystore,
+  keystoreKey,
+  keystorePassword
 }
 ```
 
@@ -74,29 +79,32 @@ options = {
 Flags include:
 
 ```console
---version|-v                  Print the current version
---name|-n <name>              The application name
---author <name>               The name of the application author
---description <text>          The description of the application
---icon|-i <path>              The application icon
---identifier <id>             The unique application identifier
---target|-t <host>            The host to target
---out|-o <dir>                The output directory
---runtime <specifier>         The runtime to use
---standalone                  Build a standalone executable
---package                     Package the application for distribution
---sign                        Sign the application
---identity <id>               The macOS signing identity
---application-identity <id>   The macOS application signing identity
---installer-identity <id>     The macOS installer signing identity
---keychain <name>             The macOS signing keychain
---entitlements <path>         The macOS signing entitlements
---hardened-runtime            Enable the macOS hardened runtime
---subject <id>                The Windows signing subject
---subject-name <name>         The Windows signing subject friendly name
---thumbprint <sha1>           The Windows signing subject thumbprint
---key <hash>                  The GPG signing key
---help|-h                     Show help
+--version|-v                     Print the current version
+--name|-n <name>                 The application name
+--author <name>                  The name of the application author
+--description <text>             The description of the application
+--icon|-i <path>                 The application icon
+--identifier <id>                The unique application identifier
+--target|-t <host>               The host to target
+--out|-o <dir>                   The output directory
+--runtime <specifier>            The runtime to use
+--standalone                     Build a standalone executable
+--package                        Package the application for distribution
+--sign                           Sign the application
+--identity <id>                  The macOS signing identity
+--application-identity <id>      The macOS application signing identity
+--installer-identity <id>        The macOS installer signing identity
+--keychain <name>                The macOS signing keychain
+--entitlements <path>            The macOS signing entitlements
+--hardened-runtime               Enable the macOS hardened runtime
+--subject <id>                   The Windows signing subject
+--subject-name <name>            The Windows signing subject friendly name
+--thumbprint <sha1>              The Windows signing subject thumbprint
+--key <hash>                     The GPG signing key
+--keystore <path>                The Java-based keystore file
+--keystore-key <name>            The name of the certificate to use from the keystore
+--keystore-password <password>   The password to the keystore file
+--help|-h                        Show help
 ```
 
 ## License

package/bin.js

@@ -31,6 +31,9 @@ const cmd = command(
   flag('--subject-name <name>', 'The Windows signing subject friendly name'),
   flag('--thumbprint <sha1>', 'The Windows signing subject thumbprint'),
   flag('--key <hash>', 'The GPG signing key'),
+  flag('--keystore <path>', 'The Java-based keystore file'),
+  flag('--keystore-key <name>', 'The name of the certificate to use from the keystore'),
+  flag('--keystore-password <password>', 'The password to the keystore file'),
   async (cmd) => {
     const { entry, preflight } = cmd.args
     let {
@@ -55,7 +58,10 @@ const cmd = command(
       subject,
       subjectName,
       thumbprint,
-      key
+      key,
+      keystore,
+      keystoreKey,
+      keystorePassword
     } = cmd.flags
 
     if (version) return console.log(`v${pkg.version}`)
@@ -82,7 +88,10 @@ const cmd = command(
         subject,
         subjectName,
         thumbprint,
-        key
+        key,
+        keystore,
+        keystoreKey,
+        keystorePassword
       })) {
       }
     } catch (err) {

package/index.js

@@ -82,6 +82,12 @@ module.exports = async function* build(entry, preflight = null, opts = {}) {
       case 'ios-x64-simulator':
         platform = require('./lib/platform/apple')
         break
+      case 'android-arm64':
+      case 'android-arm':
+      case 'android-ia32':
+      case 'android-x64':
+        platform = require('./lib/platform/android')
+        break
       case 'linux-arm64':
       case 'linux-x64':
         platform = require('./lib/platform/linux')

package/lib/platform/android.js

@@ -0,0 +1,144 @@
+const path = require('path')
+const link = require('bare-link')
+const fs = require('../fs')
+const prebuilds = require('../prebuilds')
+
+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
+
+  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}'`)
+    }
+
+    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') 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
+
+    if (package) return [aab]
+
+    const apk = path.join(out, name + '.apk')
+    await createAPK(aab, apk, opts)
+    yield apk
+
+    return [apk]
+  } 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-build",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "Application builder for Bare",
   "exports": {
     "./package": "./package.json",
@@ -68,7 +68,8 @@
     "require-asset": "^1.1.0"
   },
   "optionalDependencies": {
-    "bare-app-image": "^0.0.0"
+    "bare-apk": "^0.1.1",
+    "bare-app-image": "^0.1.0"
   },
   "devDependencies": {
     "bare-bundle": "^1.10.0",