electrobun 1.18.1 → 1.18.4-beta.10

package/dist/main.js

@@ -1,14 +1,14 @@
 // @bun
-var __require = import.meta.require;
-
 // src/launcher/main.ts
 import { join, dirname, resolve } from "path";
 import { dlopen, suffix, ptr, toArrayBuffer } from "bun:ffi";
-import { existsSync, writeFileSync } from "fs";
+import { existsSync, readFileSync, writeFileSync } from "fs";
 import { tmpdir } from "os";
+import { spawn } from "child_process";
 var pathToMacOS = dirname(process.argv0);
-var libPath = join(pathToMacOS, `libNativeWrapper.${suffix}`);
-var absoluteLibPath = resolve(libPath);
+var coreLibFileName = process.platform === "win32" ? "ElectrobunCore.dll" : `libElectrobunCore.${suffix}`;
+var coreLibPath = join(pathToMacOS, coreLibFileName);
+var absoluteCoreLibPath = resolve(coreLibPath);
 function main() {
   let channel = "";
   let identifier = "";
@@ -18,7 +18,7 @@ function main() {
     const pathToBinDir2 = dirname(pathToLauncherBin2);
     const versionJsonPath = join(pathToBinDir2, "..", "Resources", "version.json");
     if (existsSync(versionJsonPath)) {
-      const versionInfo = __require(versionJsonPath);
+      const versionInfo = JSON.parse(readFileSync(versionJsonPath, "utf8"));
       if (versionInfo.identifier) {
         identifier = versionInfo.identifier;
       }
@@ -43,7 +43,6 @@ function main() {
       console.error(`[LAUNCHER] ERROR: CEF libraries found but LD_PRELOAD not set!`);
       console.error(`[LAUNCHER] Please run through the wrapper script: ./run.sh`);
       console.error(`[LAUNCHER] Or set: LD_PRELOAD="${existingCefLibs.join(":")}" before starting.`);
-      const { spawn } = __require("child_process");
       const env = { ...process.env, LD_PRELOAD: existingCefLibs.join(":") };
       const child = spawn(process.argv[0], process.argv.slice(1), {
         env,
@@ -58,31 +57,31 @@ function main() {
     if (!process.env["LD_LIBRARY_PATH"]?.includes(".")) {
       process.env["LD_LIBRARY_PATH"] = `.${process.env["LD_LIBRARY_PATH"] ? ":" + process.env["LD_LIBRARY_PATH"] : ""}`;
     }
-    lib = dlopen(libPath, {
-      startEventLoop: {
-        args: ["cstring", "cstring", "cstring"],
-        returns: "void"
+    lib = dlopen(coreLibPath, {
+      electrobun_core_run_main_thread: {
+        args: ["cstring", "cstring", "cstring", "i32"],
+        returns: "i32"
       },
-      forceExit: {
-        args: ["i32"],
-        returns: "void"
+      electrobun_core_last_error: {
+        args: [],
+        returns: "cstring"
       }
     });
   } catch (error) {
-    console.error(`[LAUNCHER] Failed to load library: ${error.message}`);
+    console.error(`[LAUNCHER] Failed to load ElectrobunCore: ${error.message}`);
     try {
-      lib = dlopen(absoluteLibPath, {
-        startEventLoop: {
-          args: ["cstring", "cstring", "cstring"],
-          returns: "void"
+      lib = dlopen(absoluteCoreLibPath, {
+        electrobun_core_run_main_thread: {
+          args: ["cstring", "cstring", "cstring", "i32"],
+          returns: "i32"
         },
-        forceExit: {
-          args: ["i32"],
-          returns: "void"
+        electrobun_core_last_error: {
+          args: [],
+          returns: "cstring"
         }
       });
     } catch (absError) {
-      console.error(`[LAUNCHER] Library loading failed. Try running: ldd ${libPath}`);
+      console.error(`[LAUNCHER] Core library loading failed. Try running: ldd ${coreLibPath}`);
       throw error;
     }
   }
@@ -97,8 +96,8 @@ function main() {
     let asarLibPath;
     let asarLib;
     if (process.platform === "win32") {
-      asarLibPath = libPath;
-      console.log(`[LAUNCHER] Using native wrapper's ASAR reader: ${asarLibPath}`);
+      const nativeWrapperAsarLibPath = join(pathToMacOS, "libNativeWrapper.dll");
+      asarLibPath = existsSync(nativeWrapperAsarLibPath) ? nativeWrapperAsarLibPath : join(pathToMacOS, "libasar.dll");
     } else {
       asarLibPath = join(pathToMacOS, `libasar.${suffix}`);
     }
@@ -138,7 +137,11 @@ function main() {
 const __tempFilePath = "${appEntrypointPath}";
 setTimeout(() => {
     try {
-        require("fs").unlinkSync(__tempFilePath);
+        if (globalThis.cottontail?.unlinkSync) {
+            globalThis.cottontail.unlinkSync(__tempFilePath);
+        } else if (typeof require === "function") {
+            require("fs").unlinkSync(__tempFilePath);
+        }
         console.log("[LAUNCHER] Deleted temp file:", __tempFilePath);
     } catch (error) {
         console.warn("[LAUNCHER] Failed to delete temp file:", error.message);
@@ -158,7 +161,11 @@ ${fileData.toString("utf8")}
   process.on("SIGINT", () => {});
   process.on("SIGTERM", () => {});
   new Worker(appEntrypointPath, {});
-  lib.symbols.startEventLoop(ptr(new Uint8Array(Buffer.from(identifier + "\x00", "utf8"))), ptr(new Uint8Array(Buffer.from(name + "\x00", "utf8"))), ptr(new Uint8Array(Buffer.from(channel + "\x00", "utf8"))));
-  lib.symbols.forceExit(0);
+  const runStatus = lib.symbols.electrobun_core_run_main_thread(ptr(new Uint8Array(Buffer.from(identifier + "\x00", "utf8"))), ptr(new Uint8Array(Buffer.from(name + "\x00", "utf8"))), ptr(new Uint8Array(Buffer.from(channel + "\x00", "utf8"))), 0);
+  if (runStatus !== 0) {
+    const coreError = lib.symbols.electrobun_core_last_error();
+    console.error(`[LAUNCHER] ElectrobunCore failed: ${coreError ? coreError.toString() : "Unknown error"}`);
+    process.exit(runStatus);
+  }
 }
 main();