@dhruv2mars/offdex 0.0.2 → 0.0.4

package/bin/install-lib.js

@@ -136,6 +136,18 @@ export function parseChecksumForAsset(text, asset) {
   return null;
 }
 
+export function shouldReportProgress({ receivedBytes, totalBytes, lastPercent }) {
+  if (!totalBytes || totalBytes <= 0) {
+    return false;
+  }
+
+  const percent = Math.floor((receivedBytes / totalBytes) * 100);
+  if (lastPercent < 0) {
+    return true;
+  }
+  return percent === 100 || percent >= lastPercent + 10;
+}
+
 function requestProtocolFor(url) {
   return new URL(url).protocol;
 }
@@ -183,7 +195,7 @@ export function requestText(url, redirects = 0) {
   });
 }
 
-export function download(url, outputPath, redirects = 0) {
+export function download(url, outputPath, redirects = 0, options = {}) {
   if (redirects > 5) {
     throw new Error("too_many_redirects");
   }
@@ -207,7 +219,7 @@ export function download(url, outputPath, redirects = 0) {
           response.headers.location
         ) {
           response.resume();
-          download(response.headers.location, outputPath, redirects + 1).then(resolve, reject);
+          download(response.headers.location, outputPath, redirects + 1, options).then(resolve, reject);
           return;
         }
         if (response.statusCode !== 200) {
@@ -215,6 +227,12 @@ export function download(url, outputPath, redirects = 0) {
           reject(new Error(`http ${response.statusCode}`));
           return;
         }
+        const totalBytes = Number(response.headers["content-length"] || 0);
+        let receivedBytes = 0;
+        response.on("data", (chunk) => {
+          receivedBytes += chunk.length;
+          options.onProgress?.({ receivedBytes, totalBytes });
+        });
         const file = createWriteStream(partPath);
         file.on("error", async (error) => {
           await rm(partPath, { force: true });
@@ -238,6 +256,9 @@ export function download(url, outputPath, redirects = 0) {
         });
       }
     );
+    request.setTimeout(options.timeoutMs ?? 30_000, () => {
+      request.destroy(new Error("download_timeout"));
+    });
     request.on("error", async (error) => {
       await rm(partPath, { force: true });
       reject(error);
@@ -252,7 +273,8 @@ export async function installRuntime({
   arch = process.arch,
   home = homedir(),
   downloadFn = download,
-  requestTextFn = requestText
+  requestTextFn = requestText,
+  onProgress
 }) {
   assertSupportedPlatform(platform, arch);
   const installRoot = resolveInstallRoot(env, home);
@@ -279,7 +301,7 @@ export async function installRuntime({
   const tempPath = `${installBin}.download`;
   try {
     try {
-      await downloadFn(`${baseUrl}/${asset}`, tempPath);
+      await downloadFn(`${baseUrl}/${asset}`, tempPath, 0, { onProgress });
     } catch {
       throw new Error(`failed_download:${asset}`);
     }

package/bin/install.js

@@ -4,6 +4,7 @@ import { dirname, join } from "node:path";
 import {
   installRuntime,
   resolvePackageVersion,
+  shouldReportProgress,
   shouldSkipPackageInstall,
   supportedPlatformList
 } from "./install-lib.js";
@@ -17,7 +18,21 @@ if (shouldSkipPackageInstall({ env: process.env, packageRoot })) {
   process.exit(0);
 }
 
-installRuntime({ version: packageVersion })
+let lastPercent = -10;
+
+installRuntime({
+  version: packageVersion,
+  onProgress({ receivedBytes, totalBytes }) {
+    if (!shouldReportProgress({ receivedBytes, totalBytes, lastPercent })) {
+      return;
+    }
+
+    lastPercent = Math.floor((receivedBytes / totalBytes) * 100);
+    console.error(
+      `offdex: downloading native runtime ${lastPercent}% (${Math.round(receivedBytes / 1024 / 1024)}MB/${Math.round(totalBytes / 1024 / 1024)}MB)`
+    );
+  },
+})
   .then(({ installBin }) => {
     console.log(`offdex: installed ${installBin}`);
   })

package/bin/offdex-lib.js

@@ -1,7 +1,12 @@
 import { existsSync, readFileSync } from "node:fs";
 import { fileURLToPath } from "node:url";
 import { dirname, join } from "node:path";
-import { readInstalledVersion, resolveInstalledBin, shouldInstallBinary } from "./install-lib.js";
+import {
+  isWorkspaceCheckout,
+  readInstalledVersion,
+  resolveInstalledBin,
+  shouldInstallBinary
+} from "./install-lib.js";
 
 export function resolvePackageBinDir(moduleUrl = import.meta.url) {
   return dirname(fileURLToPath(moduleUrl));
@@ -18,4 +23,16 @@ export function installedVersion(env = process.env) {
   return readInstalledVersion(env);
 }
 
+export function resolveWorkspaceBridgeCli(moduleUrl = import.meta.url) {
+  const binDir = resolvePackageBinDir(moduleUrl);
+  const packageRoot = join(binDir, "..");
+  const workspaceRootPackageJson = join(packageRoot, "..", "..", "package.json");
+  if (!isWorkspaceCheckout(workspaceRootPackageJson)) {
+    return null;
+  }
+
+  const bridgeCli = join(packageRoot, "..", "bridge", "src", "cli.ts");
+  return existsSync(bridgeCli) ? bridgeCli : null;
+}
+
 export { resolveInstalledBin, shouldInstallBinary };

package/bin/offdex.js

@@ -8,13 +8,50 @@ import {
   readPackageVersion,
   resolveInstalledBin,
   resolvePackageBinDir,
+  resolveWorkspaceBridgeCli,
   shouldInstallBinary
 } from "./offdex-lib.js";
 
 const args = process.argv.slice(2);
+const HELP_TEXT = `Offdex CLI
+
+Usage:
+  offdex bridge [options]
+  offdex help
+
+Options:
+  --host <host>                 Bridge host. Default: 0.0.0.0
+  --port <port>                 Bridge port. Default: 42420
+  --mode <codex|demo>           Bridge runtime mode. Default: codex
+  --control-plane-url <url>     Managed remote control plane URL
+  -h, --help                    Show help
+
+Environment fallbacks:
+  OFFDEX_BRIDGE_HOST
+  OFFDEX_BRIDGE_PORT
+  OFFDEX_BRIDGE_MODE
+  OFFDEX_CONTROL_PLANE_URL
+`;
 const installedBin = resolveInstalledBin(process.env, process.platform);
 const packageVersion = readPackageVersion();
 const currentInstalledVersion = installedVersion(process.env);
+const workspaceBridgeCli = resolveWorkspaceBridgeCli();
+
+if (
+  !existsSync(installedBin) &&
+  (args.length === 0 || args[0] === "help" || args[0] === "--help" || args[0] === "-h")
+) {
+  console.log(HELP_TEXT);
+  process.exit(0);
+}
+
+if (workspaceBridgeCli && !existsSync(installedBin)) {
+  const result = spawnSync("bun", [workspaceBridgeCli, ...args], {
+    stdio: "inherit",
+    env: process.env
+  });
+  process.exit(result.status ?? 1);
+}
 
 if (
   shouldInstallBinary({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhruv2mars/offdex",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "Codex mobile bridge CLI for Offdex",
   "type": "module",
   "bin": {