buninu-linux 0.7.1 → 0.7.3

package/initramfs/buninu/apps/jsgotty/gotty.js

@@ -115,6 +115,26 @@ function assetFilePath(key) {
   return assets ? assets.assetDiskPath(key) : path.join(__dirname, key);
 }
 
+function windowsConptyDllPath() {
+  const dll = assetFilePath("conpty/conpty.dll");
+  if (fs.existsSync(dll)) return dll;
+  if (!assets) return null;
+  try {
+    const dllBytes = assets.readAssetBytesSync("conpty/conpty.dll");
+    const hostBytes = assets.readAssetBytesSync("conpty/OpenConsole.exe");
+    const version = crypto.createHash("sha256").update(dllBytes).digest("hex").slice(0, 16);
+    const dir = path.join(os.tmpdir(), `jsgotty-conpty-${version}`);
+    fs.mkdirSync(dir, { recursive: true });
+    for (const [name, bytes] of [["conpty.dll", dllBytes], ["OpenConsole.exe", hostBytes]]) {
+      const dest = path.join(dir, name);
+      if (!fs.existsSync(dest)) fs.writeFileSync(dest, bytes);
+    }
+    return path.join(dir, "conpty.dll");
+  } catch (error) {
+    throw new Error(`Could not prepare bundled ConPTY: ${error.message}`);
+  }
+}
+
 //  URL-relative path -> asset key, or null when it escapes `static/`.
 //  Normalizing against "/" is what makes "../../etc/passwd" unreachable.
 function staticAssetKey(relativePath) {
@@ -1624,6 +1644,10 @@ function createPtyBackend(options) {
     if (globalThis.Bun?.semver?.satisfies?.(
         globalThis.Bun?.version, ">=1.3.14"
       )) {
+      const conptyDll = windowsConptyDllPath();
+      if (conptyDll) {
+        return new (require("./windows-conpty.js"))(options, conptyDll);
+      }
       return new BunPtyBackend(options);
     }
     return new NodePtyBackend(options);

package/initramfs/buninu/apps/jsgotty/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "jsgotty",
-  "version": "1.1.11",
+  "version": "1.1.14",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "jsgotty",
-      "version": "1.1.11",
+      "version": "1.1.14",
       "dependencies": {
         "node-addon-api": "^7.1.1",
         "ws": "^8.18.3"

package/initramfs/buninu/apps/jsgotty/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsgotty",
-  "version": "1.1.12",
+  "version": "1.1.14",
   "description": "Share your terminal as a web application: A JavaScript rewrite of GoTTY",
   "license": "MIT",
   "bin": {
@@ -8,9 +8,13 @@
   },
   "type": "commonjs",
   "assets": [
+    "conpty",
     "static",
     "README.md",
-    "README.en.md"
+    "README.en.md",
+    "LICENSE",
+    "NOTICE",
+    "LICENSES"
   ],
   "dependencies": {
     "node-addon-api": "^7.1.1",

package/initramfs/buninu/apps/jsgotty/windows-conpty.js

@@ -0,0 +1,135 @@
+// Windows PTY adapter for the out-of-band Microsoft Console package.
+// Keep the same interface as BunPtyBackend in gotty.js.
+const { dlopen, ptr } = require("bun:ffi");
+const path = require("path");
+
+const kernel = dlopen("kernel32.dll", {
+  CreatePipe: { args: ["ptr", "ptr", "ptr", "u32"], returns: "i32" },
+  InitializeProcThreadAttributeList: { args: ["ptr", "u32", "u32", "ptr"], returns: "i32" },
+  UpdateProcThreadAttribute: { args: ["ptr", "u32", "usize", "ptr", "usize", "ptr", "ptr"], returns: "i32" },
+  DeleteProcThreadAttributeList: { args: ["ptr"], returns: "void" },
+  CreateProcessW: { args: ["ptr", "ptr", "ptr", "ptr", "i32", "u32", "ptr", "ptr", "ptr", "ptr"], returns: "i32" },
+  PeekNamedPipe: { args: ["ptr", "ptr", "u32", "ptr", "ptr", "ptr"], returns: "i32" },
+  ReadFile: { args: ["ptr", "ptr", "u32", "ptr", "ptr"], returns: "i32" },
+  WriteFile: { args: ["ptr", "ptr", "u32", "ptr", "ptr"], returns: "i32" },
+  GetExitCodeProcess: { args: ["ptr", "ptr"], returns: "i32" },
+  TerminateProcess: { args: ["ptr", "u32"], returns: "i32" },
+  CloseHandle: { args: ["ptr"], returns: "i32" },
+  GetLastError: { args: [], returns: "u32" },
+}).symbols;
+
+const conptySymbols = {
+  ConptyCreatePseudoConsole: { args: ["u32", "ptr", "ptr", "u32", "ptr"], returns: "i32" },
+  ConptyResizePseudoConsole: { args: ["ptr", "u32"], returns: "i32" },
+  ConptyClosePseudoConsole: { args: ["ptr"], returns: "void" },
+};
+const wide = (value) => Buffer.from(`${value}\0`, "utf16le");
+const handle = (buffer) => Number(buffer.readBigUInt64LE(0));
+const size = (cols, rows) => ((Math.max(1, rows) & 0xffff) << 16) | (Math.max(1, cols) & 0xffff);
+const winError = (operation) => new Error(`${operation} failed: ${kernel.GetLastError()}`);
+// Windows CRT argv escaping: double backslashes before quotes and at the end.
+function quoteArg(value) {
+  let result = '"', slashes = 0;
+  for (const char of String(value)) {
+    if (char === "\\") { slashes++; continue; }
+    if (char === '"') result += "\\".repeat(slashes * 2 + 1) + '"';
+    else result += "\\".repeat(slashes) + char;
+    slashes = 0;
+  }
+  return result + "\\".repeat(slashes * 2) + '"';
+}
+
+class WindowsConptyBackend {
+  constructor(options, dllPath) {
+    this.options = options;
+    this.dataHandlers = [];
+    this.exitHandlers = [];
+    this.closed = false;
+    this.conpty = dlopen(path.resolve(dllPath), conptySymbols).symbols;
+    const inputRead = Buffer.alloc(8), inputWrite = Buffer.alloc(8);
+    const outputRead = Buffer.alloc(8), outputWrite = Buffer.alloc(8);
+    if (!kernel.CreatePipe(inputRead, inputWrite, 0, 0)) throw winError("CreatePipe input");
+    if (!kernel.CreatePipe(outputRead, outputWrite, 0, 0)) throw winError("CreatePipe output");
+    this.input = handle(inputWrite);
+    this.output = handle(outputRead);
+    const pseudo = Buffer.alloc(8);
+    const hr = this.conpty.ConptyCreatePseudoConsole(
+      size(options.width || 80, options.height || 24), handle(inputRead), handle(outputWrite), 0, pseudo);
+    kernel.CloseHandle(handle(inputRead));
+    kernel.CloseHandle(handle(outputWrite));
+    if (hr !== 0) throw new Error(`ConptyCreatePseudoConsole failed: ${hr}`);
+    this.pseudo = handle(pseudo);
+
+    const listSize = Buffer.alloc(8);
+    kernel.InitializeProcThreadAttributeList(0, 1, 0, listSize);
+    const list = Buffer.alloc(Number(listSize.readBigUInt64LE(0)));
+    if (!kernel.InitializeProcThreadAttributeList(list, 1, 0, listSize)) throw winError("InitializeProcThreadAttributeList");
+    if (!kernel.UpdateProcThreadAttribute(list, 0, 0x00020016, this.pseudo, 8, 0, 0)) throw winError("UpdateProcThreadAttribute");
+    const startup = Buffer.alloc(112);
+    startup.writeUInt32LE(112, 0);
+    startup.writeUInt32LE(0x100, 60); // STARTF_USESTDHANDLES
+    startup.writeBigUInt64LE(BigInt(ptr(list)), 104);
+    const processInfo = Buffer.alloc(24);
+    const env = { ...process.env, TERM: "xterm-256color", ...(options.headerEnv || {}) };
+    const envBlock = wide(Object.entries(env).filter(([key]) => !key.startsWith("="))
+      .map(([key, value]) => `${key}=${value}`).join("\0") + "\0");
+    const executable = Bun.which(options.command) || options.command;
+    const command = wide([executable, ...options.argv].map(quoteArg).join(" "));
+    const ok = kernel.CreateProcessW(wide(executable), command, 0, 0, 0,
+      0x00080000 | 0x00000400, envBlock, wide(process.cwd()), startup, processInfo);
+    kernel.DeleteProcThreadAttributeList(list);
+    if (!ok) throw winError("CreateProcessW");
+    this.process = handle(processInfo);
+    this.pid = processInfo.readUInt32LE(16);
+    kernel.CloseHandle(Number(processInfo.readBigUInt64LE(8)));
+    this.pollTimer = setInterval(() => this.poll(), 5);
+  }
+
+  onData(handler) { this.dataHandlers.push(handler); }
+  onExit(handler) { this.exitHandlers.push(handler); }
+  write(buffer) { this.writeBinary(buffer); }
+  writeBinary(buffer) {
+    const data = Buffer.from(buffer);
+    const written = Buffer.alloc(4);
+    for (let offset = 0; offset < data.length;) {
+      const chunk = data.subarray(offset);
+      if (!kernel.WriteFile(this.input, chunk, chunk.length, written, 0)) throw winError("WriteFile");
+      const count = written.readUInt32LE(0);
+      if (!count) throw new Error("WriteFile wrote no data");
+      offset += count;
+    }
+  }
+  resize(cols, rows) {
+    const hr = this.conpty.ConptyResizePseudoConsole(this.pseudo, size(cols, rows));
+    if (hr !== 0) throw new Error(`ConptyResizePseudoConsole failed: ${hr}`);
+  }
+  kill() { if (!this.closed) kernel.TerminateProcess(this.process, 1); }
+  close() { this.kill(); }
+
+  poll() {
+    if (this.closed) return;
+    const available = Buffer.alloc(4), readCount = Buffer.alloc(4);
+    if (kernel.PeekNamedPipe(this.output, 0, 0, 0, available, 0)) {
+      for (let bytes = available.readUInt32LE(0); bytes > 0; bytes = available.readUInt32LE(0)) {
+        const data = Buffer.alloc(Math.min(bytes, 65536));
+        if (!kernel.ReadFile(this.output, data, data.length, readCount, 0)) break;
+        const count = readCount.readUInt32LE(0);
+        if (!count) break;
+        for (const handler of this.dataHandlers) handler(data.subarray(0, count));
+        if (!kernel.PeekNamedPipe(this.output, 0, 0, 0, available, 0)) break;
+      }
+    }
+    const exitCode = Buffer.alloc(4);
+    if (kernel.GetExitCodeProcess(this.process, exitCode) && exitCode.readUInt32LE(0) !== 259) {
+      this.closed = true;
+      clearInterval(this.pollTimer);
+      this.conpty.ConptyClosePseudoConsole(this.pseudo);
+      kernel.CloseHandle(this.input);
+      kernel.CloseHandle(this.output);
+      kernel.CloseHandle(this.process);
+      for (const handler of this.exitHandlers) handler();
+    }
+  }
+}
+
+module.exports = WindowsConptyBackend;

package/initramfs/buninu/package.json

@@ -1,6 +1,6 @@
 {
   "name": "buninu",
-  "version": "0.4.15",
+  "version": "0.4.18",
   "description": "Buninu is a portable, self-bootstrapping Unix-like userspace built on Bun that runs across operating systems",
   "type": "module",
   "main": "./bin/init.js",
@@ -10,7 +10,7 @@
     "type": "git",
     "url": "git+https://github.com/jjtseng93/buninu.git"
   },
-  "homepage": "https://github.com/jjtseng93/buninu#readme",
+  "homepage": "https://buninu.org",
   "bugs": {
     "url": "https://github.com/jjtseng93/buninu/issues"
   },

package/initramfs/usr/share/doc/buninu-linux/bunterm.md

@@ -6,9 +6,9 @@ xterm-compatible terminal with anti-aliased text, CJK, colour emoji, seamless
 box drawing and kitty graphics protocol images — no X11, Wayland or GPU.
 
 ```sh
-bunterm                      # run /bin/sh on the console you are on
 bunterm 2                    # start a detached bunterm on /dev/tty2
-bunterm /dev/tty1            # the full virtual-console spelling also works
+bunterm /dev/tty2            # the full virtual-console spelling also works
+bunterm                      # take over the console you are on (on tty1 that hides the bun-repl)
 bunterm -s 20                # short for --font-size 20
 bunterm -e bun /buninu/apps/jsmdcui/src/index.js --demo
 bunterm --no-mouse          # keyboard only

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "buninu-linux",
-  "version": "0.7.1",
+  "version": "0.7.3",
   "description": "A Linux distribution running Bun as PID 1 with the Buninu userspace.",
   "type": "module",
   "main": "./index.js",

package/scripts/pack-initramfs.sh

@@ -27,6 +27,29 @@ cp -a --reflink=auto "$native_dir/." "$staging/"
 cp README.md "$staging/usr/share/doc/buninu-linux/README.md"
 cp -a LICENSE NOTICE.md LICENSES "$staging/usr/share/licenses/"
 
+# os-release(5): the canonical file lives in /usr/lib and /etc/os-release links
+# to it. build-uki.sh embeds the same file as the UKI's .osrel section.
+version="$(sed -n 's/^ *"version": *"\([^"]*\)".*/\1/p' package.json | head -n 1)"
+test -n "$version" || { echo "error: no version in package.json" >&2; exit 1; }
+printf '%s\n' \
+    'NAME="Buninu Linux"' \
+    'ID=buninu-linux' \
+    "VERSION=\"$version\"" \
+    "VERSION_ID=$version" \
+    "PRETTY_NAME=\"Buninu Linux $version\"" \
+    'HOME_URL="https://buninu.org"' \
+    'BUG_REPORT_URL="https://github.com/jjtseng93/buninu-linux/issues"' \
+    'LOGO=buninu-linux' \
+    'DEFAULT_HOSTNAME=buninu' > build/os-release
+mkdir -p "$staging/usr/lib" "$staging/etc"
+cp build/os-release "$staging/usr/lib/os-release"
+ln -sfn ../usr/lib/os-release "$staging/etc/os-release"
+# LOGO names an icon-theme icon; point the standard lookup paths at the Buninu
+# icon that /buninu already ships instead of packing a second copy.
+mkdir -p "$staging/usr/share/icons/hicolor/512x512/apps" "$staging/usr/share/pixmaps"
+ln -sfn ../../../../../../buninu/icon.png "$staging/usr/share/icons/hicolor/512x512/apps/buninu-linux.png"
+ln -sfn ../../../buninu/icon.png "$staging/usr/share/pixmaps/buninu-linux.png"
+
 # fakeroot lets cpio record the character devices without real root. Nothing
 # has mounted devtmpfs when the kernel execs Bun as PID 1, so every device
 # Bun's startup needs has to be in the archive itself: