bun: xmit.json, cleanups

Author: pcarrier

bun/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xmit.co/bob",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "description": "The JS code for Oncle Bob",
   "type": "module",
   "bin": {
@@ -46,7 +46,8 @@
     "bun": ">=1.0.0"
   },
   "dependencies": {
-    "@iarna/toml": "^2.2.5"
+    "@iarna/toml": "^2.2.5",
+    "json5": "^2.2.3"
   },
   "devDependencies": {
     "@types/bun": "latest"

bun/src/cli.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env bun
 import { serve } from "./server";
-import { readFileSync, existsSync } from "fs";
+import { file } from "bun";
 import { resolve, join } from "path";
 import type { PackageJson } from "./config";
 
@@ -29,7 +29,7 @@ async function main() {
 
     while (currentDir !== "/") {
       const candidatePath = join(currentDir, "package.json");
-      if (existsSync(candidatePath)) {
+      if (await file(candidatePath).exists()) {
         packageJsonPath = candidatePath;
         break;
       }
@@ -43,7 +43,7 @@ async function main() {
 
     let pkg: PackageJson;
     try {
-      const pkgContent = readFileSync(packageJsonPath, "utf-8");
+      const pkgContent = await file(packageJsonPath).text();
       pkg = JSON.parse(pkgContent);
     } catch (err) {
       console.error(`Error reading package.json: ${err}`);
@@ -59,7 +59,7 @@ async function main() {
     const projectRoot = resolve(packageJsonPath, "..");
     const absoluteDirectory = resolve(projectRoot, directory);
 
-    if (!existsSync(absoluteDirectory)) {
+    if (!(await file(absoluteDirectory).exists())) {
       console.error(`Error: Directory "${directory}" does not exist (resolved to ${absoluteDirectory})`);
       process.exit(1);
     }

bun/src/server.ts

@@ -1,7 +1,7 @@
 import { file, type Server } from "bun";
 import { parse as parseToml } from "@iarna/toml";
+import JSON5 from "json5";
 import { join, resolve } from "path";
-import { existsSync, statSync } from "fs";
 import type { XmitConfig } from "./config";
 import { v4 as uuidv4 } from "./uuid";
 
@@ -11,14 +11,10 @@ interface ServeOptions {
   hostname?: string;
 }
 
-function openFile(path: string): string | null {
-  try {
-    const stat = statSync(path);
-    if (!stat.isDirectory()) {
-      return path;
-    }
-  } catch {
-    // File doesn't exist or can't be accessed
+async function openFile(path: string): Promise<string | null> {
+  const f = file(path);
+  if (await f.exists() && f.size > 0) {
+    return path;
   }
   return null;
 }
@@ -106,19 +102,25 @@ export async function createServer(options: ServeOptions): Promise<Server> {
     port,
     hostname,
     async fetch(request: Request): Promise<Response> {
-      // Load xmit.toml configuration
+      // Load xmit.json (JSON5) or xmit.toml configuration
       let config: XmitConfig = {};
-      const cfgPath = join(absDirectory, "xmit.toml");
+      const jsonPath = join(absDirectory, "xmit.json");
+      const tomlPath = join(absDirectory, "xmit.toml");
+
+      const jsonFile = file(jsonPath);
+      const tomlFile = file(tomlPath);
 
-      try {
-        const cfgFile = file(cfgPath);
-        if (await cfgFile.exists()) {
-          const cfgText = await cfgFile.text();
-          config = parseToml(cfgText) as XmitConfig;
+      if (await jsonFile.exists()) {
+        try {
+          config = JSON5.parse(await jsonFile.text()) as XmitConfig;
+        } catch (err) {
+          console.warn(`⚠️ ${jsonPath}: ${err}`);
         }
-      } catch (err) {
-        if (existsSync(cfgPath)) {
-          console.warn(`⚠️ ${cfgPath}: ${err}`);
+      } else if (await tomlFile.exists()) {
+        try {
+          config = parseToml(await tomlFile.text()) as XmitConfig;
+        } catch (err) {
+          console.warn(`⚠️ ${tomlPath}: ${err}`);
         }
       }
 
@@ -197,18 +199,18 @@ export async function createServer(options: ServeOptions): Promise<Server> {
       const path = url.pathname.slice(1); // Remove leading /
       const originalPath = join(absDirectory, path);
       let realPath = originalPath;
-      let foundFile = openFile(realPath);
+      let foundFile = await openFile(realPath);
 
       // Try index.html in directory
       if (!foundFile) {
         realPath = join(originalPath, "index.html");
-        foundFile = openFile(realPath);
+        foundFile = await openFile(realPath);
       }
 
       // Try .html extension
       if (!foundFile) {
         realPath = originalPath + ".html";
-        foundFile = openFile(realPath);
+        foundFile = await openFile(realPath);
       }
 
       // Try redirects
@@ -230,15 +232,15 @@ export async function createServer(options: ServeOptions): Promise<Server> {
       // Try fallback
       if (!foundFile && config.fallback) {
         realPath = join(absDirectory, config.fallback);
-        foundFile = openFile(realPath);
+        foundFile = await openFile(realPath);
       }
 
       // Try 404 page
       if (!foundFile) {
         status = 404;
         if (config["404"]) {
           realPath = join(absDirectory, config["404"]);
-          foundFile = openFile(realPath);
+          foundFile = await openFile(realPath);
         }
       }
 

flake.nix

@@ -18,7 +18,7 @@
       {
         devShell = pkgs.mkShell {
           buildInputs = with pkgs; [
-            deno
+            bun
             flutter
             pnpm
           ];