fbi-proxy 1.3.0 → 1.4.0

package/package.json

@@ -52,6 +52,7 @@
     "dev:rs": "cd rs && bacon run",
     "dev:rs-watch": "cd rs && cargo watch -x run",
     "start": "bun ts/cli.ts",
+    "start:js": "node dist/cli.js",
     "start:caddy": "./caddy run",
     "start:rs": "./target/release/fbi-proxy",
     "prepare": "husky && bunx rustup && bacon --version || cargo install bacon"
@@ -67,5 +68,5 @@
   "bin": {
     "fbi-proxy": "dist/cli.js"
   },
-  "version": "1.3.0"
+  "version": "1.4.0"
 }

package/ts/buildFbiProxy.ts

@@ -1,4 +1,5 @@
 import fsp from "fs/promises";
+import { existsSync } from "fs";
 import { getProxyFilename } from "./getProxyFilename";
 import { copyFile } from "fs/promises";
 import { $ } from "./dRun";
@@ -16,16 +17,16 @@ export async function buildFbiProxy({ rebuild = false } = {}) {
   const built = `./target/release/fbi-proxy${isWin ? ".exe" : ""}`;
 
   // return built if exists
-  if (!rebuild && (await fsp.exists(built))) {
+  if (!rebuild && existsSync(built)) {
     return built;
   }
 
   // return release if exists
-  if (!rebuild && (await fsp.exists(release))) return release;
+  if (!rebuild && existsSync(release)) return release;
 
   // build and return built target
   await $`cargo build --release`;
-  if (await fsp.exists(built)) return built;
+  if (existsSync(built)) return built;
 
   throw new Error(
     "Oops, failed to build fbi-proxy binary. Please check your Rust setup.",

package/ts/cli.ts

@@ -1,52 +1,17 @@
 #!/usr/bin/env bun
 import getPort from "get-port";
+import hotMemo from "hot-memo";
 import minimist from "minimist";
-import { exec, spawn } from "child_process";
 import path from "path";
-import tsaComposer from "tsa-composer";
-import { fromStdio } from "from-node-stream";
-import sflow from "sflow";
-import hotMemo from "hot-memo";
-import fsp from "fs/promises";
-import { exists, existsSync } from "fs";
-import { getProxyFilename } from "./getProxyFilename";
-import { DIE } from "phpdie";
 import promiseAllProperties from "promise-all-properties";
 import { buildFbiProxy } from "./buildFbiProxy";
 import { $ } from "./dRun";
+import { downloadCaddy } from "./downloadCaddy";
 
 process.chdir(path.resolve(__dirname, "..")); // Change to project root directory
 
 console.log("Preparing Binaries");
 
-const downloadCaddy = async () => {
-  // use pwdCaddy if already downloaded
-  const pwdCaddy = "./caddy";
-
-  // if ./caddy exists in pwd, return it
-  if (await fsp.exists(pwdCaddy)) return pwdCaddy;
-
-  // 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;
-};
-
 const { proxy, caddy } = await promiseAllProperties({
   proxy: buildFbiProxy(),
   caddy: downloadCaddy(),

package/ts/downloadCaddy.ts

@@ -0,0 +1,31 @@
+import { existsSync } from "fs";
+import fsp from "fs/promises";
+import { $ } from "./dRun";
+
+export const downloadCaddy = async () => {
+  // use pwdCaddy if already downloaded
+  const pwdCaddy = "./caddy";
+
+  // if ./caddy exists in pwd, return it
+  if (existsSync(pwdCaddy)) return pwdCaddy;
+
+  // 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;
+};

package/ts/download-fbiproxy.ts

@@ -1,35 +0,0 @@
-import { getProxyFilename } from "./getProxyFilename";
-
-// download latest github release
-// https://github.com/snomiao/fbi-proxy/releases/download/v1.2.0/proxy-windows-x64.exe
-// https://github.com/snomiao/fbi-proxy/releases/latest/download/fbi-proxy-windows-x64.exe
-const url = 'https://github.com/snomiao/fbi-proxy/releases/latest/download/' + getProxyFilename()
-console.log(url)
-
-// const res = await fetch()
-// if (!res.ok) {
-//   throw new Error("Failed to download proxy file: " + res.statusText);
-// }
-// // show progress
-// const progress = new ReadableStream({
-//     start(controller) {
-//         const reader = res.body.getReader();
-//         let loaded = 0;
-//         const total = Number(res.headers.get('Content-Length'));
-//         function push() {
-//         reader.read().then(({ done, value }) => {
-//             if (done) {
-//             controller.close();
-//             return;
-//             }
-//             loaded += value.length;
-//             console.log(`Downloaded ${((loaded / total) * 100).toFixed(2)}%`);
-//             controller.enqueue(value);
-//             push();
-//         });
-//         }
-//         push();
-//     }
-//     });
-// console.log(await Bun.write(('release/' + getProxyFilename()), progress))
-