fbi-proxy 1.4.0 → 1.6.0

package/ts/cli.ts

@@ -1,49 +1,43 @@
 #!/usr/bin/env bun
 import getPort from "get-port";
 import hotMemo from "hot-memo";
-import minimist from "minimist";
 import path from "path";
-import promiseAllProperties from "promise-all-properties";
-import { buildFbiProxy } from "./buildFbiProxy";
-import { $ } from "./dRun";
+import yargs from "yargs";
+import { hideBin } from "yargs/helpers";
+import { getFbiProxyBinary } from "./buildFbiProxy";
+import { $ } from "./dSpawn";
 import { downloadCaddy } from "./downloadCaddy";
+import { execa } from "execa";
 
 process.chdir(path.resolve(__dirname, "..")); // Change to project root directory
 
-console.log("Preparing Binaries");
-
-const { proxy, caddy } = await promiseAllProperties({
-  proxy: buildFbiProxy(),
-  caddy: downloadCaddy(),
-});
+// Parse command line arguments with yargs
+const argv = await yargs(hideBin(process.argv))
+  .option("fbihost", {
+    type: "string",
+    default: "fbi.com",
+    description: "Set the FBI host",
+  })
+  .option("caddy", {
+    type: "boolean",
+    default: false,
+    description: "Start Caddy server",
+  })
+  .option("dev", {
+    alias: "d",
+    type: "boolean",
+    default: false,
+    description: "Run in development mode",
+  })
+  .help().argv;
 
-console.log("Running fbi-proxy", JSON.stringify({ caddy, proxy }));
+console.log("Preparing Binaries");
 
-// assume caddy is installed, launch proxy server now
-const argv = minimist(process.argv.slice(2), {
-  default: {
-    dev: false,
-    d: false,
-    fbihost: "fbi.com", // Default FBI host
-  },
-  alias: {
-    dev: "d",
-  },
-  boolean: ["dev", "d", "help"],
-});
-// console.log(argv);
-if (argv.help) {
-  console.log(`Usage: fbi-proxy [options]
-Options:
-  --help          Show this help message
-  --fbihost       Set the FBI host (default: fbi.com)
-`);
-  process.exit(0);
-}
+const FBIHOST = argv.fbihost;
+const FBIPROXY_PORT = String(await getPort({ port: 2432 }));
 
-const FBIHOST = argv.fbihost || "fbi.com"; // Default FBI host
-const FBIPROXY_PORT = String(await getPort({ port: 24306 }));
 const proxyProcess = await hotMemo(async () => {
+  const proxy = await getFbiProxyBinary();
   console.log("Starting Rust proxy server");
   const p = $.opt({
     env: {
@@ -59,25 +53,35 @@ const proxyProcess = await hotMemo(async () => {
   return p;
 });
 
-const caddyProcess = await hotMemo(async () => {
-  const p = $.opt({
-    env: {
-      ...process.env,
-      FBIPROXY_PORT, // Rust proxy server port
-      FBIHOST,
-    },
-  })`${caddy} run`.process;
-  p.on("exit", (code) => {
-    console.log(`Caddy exited with code ${code}`);
-    process.exit(code || 0);
+let caddyProcess: any = null;
+
+// Only start Caddy if --caddy flag is passed
+if (argv.caddy) {
+  const caddy = await downloadCaddy();
+  caddyProcess = await hotMemo(async () => {
+    const p = $.opt({
+      env: {
+        ...process.env,
+        FBIPROXY_PORT, // Rust proxy server port
+        FBIHOST,
+      },
+    })`${caddy} run`.process;
+    p.on("exit", (code) => {
+      console.log(`Caddy exited with code ${code}`);
+      process.exit(code || 0);
+    });
+    return p;
   });
-  return p;
-});
+}
 
-console.log("all done");
+console.log("All services started successfully!");
 // show process pids
 console.log(`Proxy server PID: ${proxyProcess.pid}`);
-console.log(`Caddy server PID: ${caddyProcess.pid}`);
+if (caddyProcess) {
+  console.log(`Caddy server PID: ${caddyProcess.pid}`);
+} else {
+  console.log("Caddy server not started (use --caddy to start it)");
+}
 
 const exit = () => {
   console.log("Shutting down...");

package/ts/{dRun.ts → dSpawn.ts}

@@ -15,17 +15,18 @@ type DRunProc = Promise<{
   process: ChildProcess;
 };
 
-const dRun = ({
+const dSpawn = ({
   cwd = process.cwd(),
   env = process.env as Record<string, string>,
 } = {}) =>
   tsaComposer(
-    (s: string | { raw: string }) =>
-      typeof s === "string"
+    // slot is un dividable
+    (slot: string | { raw: string }) =>
+      typeof slot === "string"
         ? {
-            raw: String(s), // todo: escape quotes
+            raw: String(slot), // todo: escape quotes
           }
-        : s,
+        : slot,
     (...slots): DRunProc => {
       try {
         // TODO: parse slots for quotes
@@ -106,7 +107,7 @@ const dRun = ({
     },
   );
 
-export const $ = Object.assign(dRun(), {
-  opt: dRun,
-  cwd: (path: string) => dRun({ cwd: path }),
+export const $ = Object.assign(dSpawn(), {
+  opt: dSpawn,
+  cwd: (path: string) => dSpawn({ cwd: path }),
 });

package/ts/downloadCaddy.ts

@@ -1,31 +1,24 @@
 import { existsSync } from "fs";
-import fsp from "fs/promises";
-import { $ } from "./dRun";
+import { $ } from "./dSpawn";
 
-export const downloadCaddy = async () => {
-  // use pwdCaddy if already downloaded
-  const pwdCaddy = "./caddy";
+if (import.meta.main) {
+  // if this file is run directly, download caddy
+  const caddy = await downloadCaddy();
+  console.log(`Caddy downloaded to: ${caddy}`);
+  process.exit(0);
+}
 
-  // if ./caddy exists in pwd, return it
+export async function downloadCaddy() {
+  // use pwdCaddy if already downloaded
+  const pwdCaddy = "./node_modules/.bin/caddy";
   if (existsSync(pwdCaddy)) return pwdCaddy;
 
-  // or use system caddy if installed, run `caddy --version` to check
+  // // or use system caddy if installed, run `caddy --version` to check
   if (await $`caddy --version`.catch(() => false)) {
     return "caddy";
   }
 
-  // or if system caddy is not installed, download caddy using caddy-baron
-  if (!existsSync(pwdCaddy)) {
-    // download latest caddy to ./caddy
-    console.log("Downloading Caddy...");
-    // @ts-ignore
-    await import("../node_modules/caddy-baron/index.mjs");
-
-    if (!existsSync(pwdCaddy))
-      throw new Error(
-        "Failed to download Caddy. Please install Caddy manually or check your network connection.",
-      );
-  }
-
-  return pwdCaddy;
-};
+  throw new Error(
+    "Failed to download Caddy. Please install Caddy manually or check your network connection.",
+  );
+}

package/ts/getProxyFilename.ts

@@ -1,4 +1,4 @@
-export function getProxyFilename() {
+export function getFbiProxyFilename() {
     return {
         "darwin-arm64": "fbi-proxy-darwin",
         "darwin-x64": "fbi-proxy-darwin",