bare-build 0.2.0 → 0.2.2

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

@@ -1,7 +1,9 @@
 const path = require('path')
 const link = require('bare-link')
 const unpack = require('bare-unpack')
+const { PE } = require('bare-lief')
 const fs = require('../../fs')
+const { windows } = require('../../assets')
 const prebuilds = require('../../prebuilds')
 const sign = require('./sign')
 
@@ -13,7 +15,7 @@ module.exports = async function* createMSIXContentDirectory(
   out,
   opts = {}
 ) {
-  const { name = pkg.name, icon } = opts
+  const { name = pkg.name || 'App', icon = windows.icon } = opts
 
   const app = path.resolve(out, name)
 
@@ -30,8 +32,12 @@ module.exports = async function* createMSIXContentDirectory(
 
   yield* link(base, { ...opts, hosts: [host], out: bin })
 
+  const binary = new PE.Binary(await fs.readFile(prebuilds[host]()))
+
+  binary.optionalHeader.subsystem = PE.OptionalHeader.SUBSYSTEM.WINDOWS_GUI
+
   const executable = path.join(bin, name + '.exe')
-  await fs.copyFile(prebuilds[host](), executable)
+  binary.toDisk(executable)
   await sign(executable, opts)
   yield executable
 
@@ -70,13 +76,13 @@ const unsignedSubject = 'CN=AppModelSamples, OID.2.25.31172936891398431765440773
 
 function createAppxManifest(pkg, host, opts = {}) {
   let {
-    name = pkg.name,
+    name = pkg.name || 'App',
     identifier = toIdentifier(name),
-    version = pkg.version,
+    version = pkg.version || '1.0.0',
     description = pkg.description,
     author = pkg.author,
     language = 'en-US',
-    icon,
+    icon = windows.icon,
     subject = unsignedSubject
   } = opts
 

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

@@ -4,7 +4,7 @@ const run = require('../../run')
 const sign = require('./sign')
 
 module.exports = async function* createMSIX(pkg, contentDirectory, out, opts = {}) {
-  const { name = pkg.name } = opts
+  const { name = pkg.name || 'App' } = opts
 
   const msix = path.resolve(out, name + '.msix')
   await fs.rm(msix)

package/lib/platform/windows.js

@@ -2,9 +2,10 @@ const path = require('path')
 const fs = require('../fs')
 const createMSIX = require('./windows/create-msix')
 const createMSIXContentDirectory = require('./windows/create-msix-content-directory')
+const createExecutable = require('./windows/create-executable')
 
 module.exports = async function* windows(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 = async function* windows(base, pkg, bundle, opts = {}) {
 
         contentDirectory = yield* createMSIXContentDirectory(base, pkg, bundle, host, out, opts)
       } else {
-        contentDirectory = yield* createMSIXContentDirectory(
-          base,
-          pkg,
-          bundle,
-          host,
-          archs.size === 1 ? path.resolve(out) : path.resolve(out, arch),
-          opts
-        )
-
-        result.push(contentDirectory)
+        if (standalone) {
+          result.push(
+            yield* createExecutable(
+              pkg,
+              bundle,
+              host,
+              archs.size === 1 ? path.resolve(out) : path.resolve(out, arch),
+              opts
+            )
+          )
+        } else {
+          result.push(
+            yield* createMSIXContentDirectory(
+              base,
+              pkg,
+              bundle,
+              host,
+              archs.size === 1 ? path.resolve(out) : path.resolve(out, arch),
+              opts
+            )
+          )
+        }
 
         continue
       }

package/lib/runtime/apple.h

@@ -0,0 +1,22 @@
+#include <mach-o/getsect.h>
+#include <mach-o/loader.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <uv.h>
+
+extern const struct mach_header_64 _mh_execute_header;
+
+static inline void
+bare__prepare_main(void) {}
+
+static inline int
+bare__get_embedded_bundle(uv_buf_t *result) {
+  size_t len;
+  uint8_t *bundle = getsectiondata(&_mh_execute_header, "__BARE", "__bundle", &len);
+
+  if (bundle == NULL) return -1;
+
+  *result = uv_buf_init((char *) bundle, len);
+
+  return 0;
+}

package/lib/runtime/linux.h

@@ -0,0 +1,17 @@
+#include <stddef.h>
+#include <uv.h>
+
+extern char __bare_bundle_begin[] __attribute__((weak));
+extern char __bare_bundle_end[] __attribute__((weak));
+
+static inline void
+bare__prepare_main(void) {}
+
+static inline int
+bare__get_embedded_bundle(uv_buf_t *result) {
+  if (__bare_bundle_begin == NULL || __bare_bundle_end == NULL) return -1;
+
+  *result = uv_buf_init(__bare_bundle_begin, __bare_bundle_end - __bare_bundle_begin);
+
+  return 0;
+}

package/lib/runtime/windows.h

@@ -0,0 +1,45 @@
+#include <string.h>
+#include <uv.h>
+#include <windows.h>
+
+static inline void
+bare__prepare_main(void) {
+  if (GetConsoleWindow() == NULL) {
+    freopen("NUL", "r", stdin);
+    freopen("NUL", "w", stdout);
+    freopen("NUL", "w", stderr);
+  }
+}
+
+static inline int
+bare__get_embedded_bundle(uv_buf_t *result) {
+  HMODULE module = GetModuleHandle(NULL);
+
+  PIMAGE_DOS_HEADER dos = (PIMAGE_DOS_HEADER) module;
+  if (dos->e_magic != IMAGE_DOS_SIGNATURE) {
+    return -1;
+  }
+
+  PIMAGE_NT_HEADERS nt = (PIMAGE_NT_HEADERS) ((BYTE *) module + dos->e_lfanew);
+  if (nt->Signature != IMAGE_NT_SIGNATURE) {
+    return -1;
+  }
+
+  PIMAGE_SECTION_HEADER sections = IMAGE_FIRST_SECTION(nt);
+
+  for (int i = 0, n = nt->FileHeader.NumberOfSections; i < n; i++) {
+    PIMAGE_SECTION_HEADER section = &sections[i];
+
+    char name[9];
+    name[8] = '\0';
+    memcpy(name, section->Name, 8);
+
+    if (strcmp(name, ".bare") == 0) {
+      *result = uv_buf_init((char *) ((BYTE *) module + section->VirtualAddress), sections->Misc.VirtualSize);
+
+      return 0;
+    }
+  }
+
+  return -1;
+}