@dhruv2mars/offdex 0.0.3 → 0.0.5

package/bin/install-lib.js

@@ -5,6 +5,7 @@ import http from "node:http";
 import https from "node:https";
 import { homedir } from "node:os";
 import { join } from "node:path";
+import { gunzipSync } from "node:zlib";
 
 const REPO = "Dhruv2mars/offdex";
 const SUPPORTED_TARGETS = new Map([
@@ -58,6 +59,10 @@ export function checksumsAssetNameFor(platform = process.platform, arch = proces
   return `checksums-${platform}-${arch}.txt`;
 }
 
+export function compressedAssetNameFor(platform = process.platform, arch = process.arch) {
+  return `${assetNameFor(platform, arch)}.gz`;
+}
+
 export function resolveInstallRoot(env = process.env, home = homedir()) {
   return env.OFFDEX_INSTALL_ROOT || join(home, ".offdex");
 }
@@ -136,6 +141,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 +200,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 +224,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 +232,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 +261,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,13 +278,15 @@ export async function installRuntime({
   arch = process.arch,
   home = homedir(),
   downloadFn = download,
-  requestTextFn = requestText
+  requestTextFn = requestText,
+  onProgress
 }) {
   assertSupportedPlatform(platform, arch);
   const installRoot = resolveInstallRoot(env, home);
   const installBin = resolveInstalledBin(env, platform, home);
   const installMeta = resolveInstallMetaPath(env, home);
   const asset = assetNameFor(platform, arch);
+  const compressedAsset = compressedAssetNameFor(platform, arch);
   const checksumsAsset = checksumsAssetNameFor(platform, arch);
   const baseUrl = env.OFFDEX_RELEASE_BASE_URL
     || `https://github.com/${REPO}/releases/download/v${version}`;
@@ -271,21 +299,42 @@ export async function installRuntime({
   } catch {
     throw new Error(`failed_download:${checksumsAsset}`);
   }
-  const expectedChecksum = parseChecksumForAsset(checksumsText, asset);
+  const expectedCompressedChecksum = parseChecksumForAsset(checksumsText, compressedAsset);
+  const expectedChecksum = expectedCompressedChecksum || parseChecksumForAsset(checksumsText, asset);
   if (!expectedChecksum) {
     throw new Error(`missing_checksum:${asset}`);
   }
 
   const tempPath = `${installBin}.download`;
   try {
-    try {
-      await downloadFn(`${baseUrl}/${asset}`, tempPath);
-    } catch {
-      throw new Error(`failed_download:${asset}`);
-    }
-    const actualChecksum = createHash("sha256").update(readFileSync(tempPath)).digest("hex");
-    if (actualChecksum !== expectedChecksum) {
-      throw new Error(`checksum_mismatch:${asset}`);
+    if (expectedCompressedChecksum) {
+      const compressedPath = `${tempPath}.gz`;
+      try {
+        await downloadFn(`${baseUrl}/${compressedAsset}`, compressedPath, 0, { onProgress });
+      } catch {
+        throw new Error(`failed_download:${compressedAsset}`);
+      }
+      try {
+        const actualCompressedChecksum = createHash("sha256")
+          .update(readFileSync(compressedPath))
+          .digest("hex");
+        if (actualCompressedChecksum !== expectedCompressedChecksum) {
+          throw new Error(`checksum_mismatch:${compressedAsset}`);
+        }
+        await writeFile(tempPath, gunzipSync(readFileSync(compressedPath)));
+      } finally {
+        await rm(compressedPath, { force: true });
+      }
+    } else {
+      try {
+        await downloadFn(`${baseUrl}/${asset}`, tempPath, 0, { onProgress });
+      } catch {
+        throw new Error(`failed_download:${asset}`);
+      }
+      const actualChecksum = createHash("sha256").update(readFileSync(tempPath)).digest("hex");
+      if (actualChecksum !== expectedChecksum) {
+        throw new Error(`checksum_mismatch:${asset}`);
+      }
     }
     if (platform !== "win32") {
       await chmod(tempPath, 0o755);

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.js

@@ -13,11 +13,38 @@ import {
 } 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",

package/package.json

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