Use zfetch instead of cURL, fix runtime bugs

Author: theseyan

.github/workflows/blank.yml renamed to .github/workflows/CI.yml

@@ -13,3 +13,6 @@
 [submodule "deps/zip"]
 	path = deps/zip
 	url = https://github.com/kuba--/zip
+[submodule "deps/zfetch"]
+	path = deps/zfetch
+	url = https://github.com/truemedian/zfetch

.gitmodules

@@ -40,13 +40,13 @@ bkg and pkg (Node) have a number of differences arising either from a design dec
 bkg is written in Zig and compilation is fairly straightforward. The prerequisites are:
 - Zig version [0.10.0-dev.3554+bfe8a4d9f](https://ziglang.org/builds/zig-0.10.0-dev.3554+bfe8a4d9f.tar.xz)
 
-```properties
+```bash
 # Clone the repository and update submodules
 git clone https://github.com/theseyan/bkg && cd bkg
 git submodule update --init --recursive
 
 # Build for x86_64-linux
-zig build -Drelease-fast -target x86_64-linux
+zig build -Drelease-fast -Dtarget=x86_64-linux
 
 # [Optional] Build runtime for x86_64-linux
 zig build-exe -target x86_64-linux src/bkg_runtime.zig -lc deps/lz4/lib/lz4.c deps/microtar/src/microtar.c --pkg-begin known-folders deps/known-folders/known-folders.zig --pkg-end
@@ -59,9 +59,11 @@ zig build-exe -target x86_64-linux src/bkg_runtime.zig -lc deps/lz4/lib/lz4.c de
 
 - Compiler: Stream archive directly to `lz4_compress_default` instead of through the filesystem
 - Runtime: Stream decompressed buffer directly to microtar instead of through the filesystem. This will greatly improve startup time.
+- Pass CLI args to javascript
+- Use [uuid](https://github.com/dmgk/zig-uuid) temporary directory naming to prevent possible naming conflicts
 - Bundle sources (and possibly node_modules) into a single file before packaging
 - JSON build script, advanced options to include external assets, make compression optional
 - Bun CLI flags
-- Use [zfetch](https://github.com/truemedian/zfetch) instead of cURL
+- :white_check_mark: ~~Use [zfetch](https://github.com/truemedian/zfetch) instead of cURL~~
 - Fork a custom build of Bun with only the JS runtime and use that instead of the official binaries
 - If size of `bun` can be brought down under 50 MB, consider executing directly from memory

README.md

@@ -1,4 +1,5 @@
 const std = @import("std");
+const zfetch = @import("deps/zfetch/build.zig");
 
 pub fn build(b: *std.build.Builder) !void {
     const target = b.standardTargetOptions(.{});
@@ -19,8 +20,8 @@ pub fn build(b: *std.build.Builder) !void {
     // Link zig-clap library
     exe.addPackagePath("clap", "deps/zig-clap/clap.zig");
 
-    // Link cURL
-    exe.linkSystemLibrary("curl");
+    // Link zfetch
+    exe.addPackage(try zfetch.getPackage(b));
 
     // Link known-folders
     exe.addPackagePath("known-folders", "deps/known-folders/known-folders.zig");

build.zig

@@ -2,7 +2,7 @@
 // It should only deal with running the packaged app
 
 // To build the runtime
-// zig build-exe src/bkg_runtime.zig -lc deps/lz4/lib/lz4.c deps/microtar/src/microtar.c --pkg-begin known-folders deps/known-folders/known-folders.zig --pkg-end
+// zig build-exe -Drelease-fast src/bkg_runtime.zig -lc deps/lz4/lib/lz4.c deps/microtar/src/microtar.c --pkg-begin known-folders deps/known-folders/known-folders.zig --pkg-end
 // Strip debug symbols:
 // strip bkg_runtime
 

deps/zfetch

@@ -79,6 +79,7 @@ pub fn init(allocator: std.mem.Allocator) anyerror!void {
 
         // Initialize version manager
         try versionManager.init(allocator);
+        defer versionManager.deinit();
 
         // Make sure we have the latest Bun and bkg runtime for the target
         var runtimePath = try versionManager.downloadBun(try versionManager.getLatestBunVersion(), target);

src/bkg_runtime.zig

@@ -19,6 +19,17 @@ pub fn build(allocator: std.mem.Allocator, bunPath: []const u8, bkgPath: []const
     // Rename executable
     try std.fs.renameAbsolute("/tmp/__bkg_build_runtime", out);
 
+    // Give executable permissions
+    var file: ?std.fs.File = std.fs.openFileAbsolute(out, .{}) catch |e| switch(e) {
+        else => null
+    };
+    if(file != null) {
+        try file.?.chmod(755);
+        file.?.close();
+    }else {
+        std.debug.print("Could not mark binary as executable. Run `chmod +x {s}` to do it manually.\n", .{std.fs.path.basename(out)});
+    }
+
     _ = target;
     return out;
 
@@ -68,10 +79,10 @@ pub fn buildArchive(allocator: std.mem.Allocator, bun_path: []const u8, root: []
 
     // Add Bun binary to archive
     {
+        std.debug.print("Adding Bun binary...\n", .{});
         var bun = try std.fs.openFileAbsolute(bun_path, .{});
         const bunBuf: []u8 = try bun.readToEndAlloc(allocator, 256 * 1024 * 1024);
 
-        std.debug.print("Adding Bun binary...\n", .{});
         _ = mtar.mtar_write_file_header(&tar, "bkg_bun", @intCast(c_uint, bunBuf.len));
         _ = mtar.mtar_write_data(&tar, bunBuf.ptr, @intCast(c_uint, bunBuf.len));
 

src/cli.zig

@@ -120,7 +120,7 @@ pub fn execProcess(allocator: std.mem.Allocator, root: []const u8) anyerror!void
     // Give executable permissions to bun
     var file: ?std.fs.File = std.fs.openFileAbsolute(try std.mem.concat(allocator, u8, &.{root, "/", "bkg_bun"}), .{}) catch |e| switch(e) {
         error.AccessDenied => null,
-        else => return error.FailedToOpenExecutable
+        else => return e
     };
 
     // We get an error.AccessDenied if the file is already executable