@oatnil/ud 0.33.0 → 0.49.2

package/README.md

@@ -1,6 +1,6 @@
 # @oatnil/ud
 
-UnderControl CLI - task and expense management from the terminal.
+UnDercontrol CLI - task and expense management from the terminal.
 
 ## Install
 

package/install.js

@@ -1,13 +1,7 @@
 #!/usr/bin/env node
 
-const https = require("https");
 const fs = require("fs");
 const path = require("path");
-const { execSync } = require("child_process");
-const zlib = require("zlib");
-
-const CDN_BASE =
-  "https://pub-35d77f83ee8a41798bb4b2e1831ac70a.r2.dev/cli/releases";
 
 const PLATFORM_MAP = {
   darwin: "darwin",
@@ -20,98 +14,7 @@ const ARCH_MAP = {
   arm64: "arm64",
 };
 
-function getBinaryName(version, goos, goarch) {
-  const name = `ud_${version}_${goos}_${goarch}`;
-  return goos === "windows" ? `${name}.exe` : name;
-}
-
-function getArchiveName(version, goos, goarch) {
-  const base = `ud_${version}_${goos}_${goarch}`;
-  return goos === "windows" ? `${base}.zip` : `${base}.tar.gz`;
-}
-
-function fetch(url) {
-  return new Promise((resolve, reject) => {
-    https
-      .get(url, (res) => {
-        if (res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {
-          return fetch(res.headers.location).then(resolve, reject);
-        }
-        if (res.statusCode !== 200) {
-          return reject(new Error(`HTTP ${res.statusCode} for ${url}`));
-        }
-        const chunks = [];
-        res.on("data", (chunk) => chunks.push(chunk));
-        res.on("end", () => resolve(Buffer.concat(chunks)));
-        res.on("error", reject);
-      })
-      .on("error", reject);
-  });
-}
-
-function extractTarGz(buffer, binaryName, destPath) {
-  // tar.gz: use tar command for simplicity
-  const tmpDir = path.join(path.dirname(destPath), ".ud-tmp");
-  fs.mkdirSync(tmpDir, { recursive: true });
-
-  const archivePath = path.join(tmpDir, "archive.tar.gz");
-  fs.writeFileSync(archivePath, buffer);
-
-  try {
-    execSync(`tar -xzf "${archivePath}" -C "${tmpDir}"`, { stdio: "pipe" });
-
-    const extractedBinary = path.join(tmpDir, binaryName);
-    if (!fs.existsSync(extractedBinary)) {
-      // try finding any file in tmpDir
-      const files = fs.readdirSync(tmpDir).filter((f) => f !== "archive.tar.gz");
-      if (files.length === 0) {
-        throw new Error(`No binary found in archive`);
-      }
-      fs.renameSync(path.join(tmpDir, files[0]), destPath);
-    } else {
-      fs.renameSync(extractedBinary, destPath);
-    }
-  } finally {
-    fs.rmSync(tmpDir, { recursive: true, force: true });
-  }
-}
-
-function extractZip(buffer, binaryName, destPath) {
-  const tmpDir = path.join(path.dirname(destPath), ".ud-tmp");
-  fs.mkdirSync(tmpDir, { recursive: true });
-
-  const archivePath = path.join(tmpDir, "archive.zip");
-  fs.writeFileSync(archivePath, buffer);
-
-  try {
-    // Use PowerShell on Windows, unzip on others
-    if (process.platform === "win32") {
-      execSync(
-        `powershell -command "Expand-Archive -Path '${archivePath}' -DestinationPath '${tmpDir}'"`,
-        { stdio: "pipe" }
-      );
-    } else {
-      execSync(`unzip -o "${archivePath}" -d "${tmpDir}"`, { stdio: "pipe" });
-    }
-
-    const extractedBinary = path.join(tmpDir, binaryName);
-    if (!fs.existsSync(extractedBinary)) {
-      const files = fs
-        .readdirSync(tmpDir)
-        .filter((f) => f !== "archive.zip");
-      if (files.length === 0) {
-        throw new Error(`No binary found in archive`);
-      }
-      fs.renameSync(path.join(tmpDir, files[0]), destPath);
-    } else {
-      fs.renameSync(extractedBinary, destPath);
-    }
-  } finally {
-    fs.rmSync(tmpDir, { recursive: true, force: true });
-  }
-}
-
-async function main() {
+function main() {
   const pkg = require("./package.json");
   const version = pkg.version;
 
@@ -128,43 +31,48 @@ async function main() {
   }
 
   const binDir = path.join(__dirname, "bin");
-  fs.mkdirSync(binDir, { recursive: true });
-
   const binaryExt = goos === "windows" ? ".exe" : "";
   const destPath = path.join(binDir, `ud${binaryExt}`);
 
-  // Skip if binary already exists
+  // Skip if already set up
   if (fs.existsSync(destPath)) {
-    console.log(`ud binary already exists at ${destPath}`);
     return;
   }
 
-  const archiveName = getArchiveName(version, goos, goarch);
-  const binaryName = getBinaryName(version, goos, goarch);
-  const url = `${CDN_BASE}/${version}/${archiveName}`;
-
-  console.log(`Downloading ud v${version} for ${goos}/${goarch}...`);
-  console.log(`  ${url}`);
+  // Find the matching bundled binary
+  const binaryName = `ud_${version}_${goos}_${goarch}${binaryExt}`;
+  const sourcePath = path.join(binDir, binaryName);
+
+  if (!fs.existsSync(sourcePath)) {
+    console.error(
+      `Binary not found for ${process.platform}/${process.arch}: ${binaryName}`
+    );
+    console.error(`Available binaries in ${binDir}:`);
+    if (fs.existsSync(binDir)) {
+      fs.readdirSync(binDir).forEach((f) => console.error(`  ${f}`));
+    }
+    process.exit(1);
+  }
 
-  try {
-    const buffer = await fetch(url);
+  // Rename the matching binary to 'ud'
+  fs.renameSync(sourcePath, destPath);
 
-    if (archiveName.endsWith(".zip")) {
-      extractZip(buffer, binaryName, destPath);
-    } else {
-      extractTarGz(buffer, binaryName, destPath);
-    }
+  // Make executable on unix
+  if (goos !== "windows") {
+    fs.chmodSync(destPath, 0o755);
+  }
 
-    // Make executable
-    if (goos !== "windows") {
-      fs.chmodSync(destPath, 0o755);
+  // Clean up other platform binaries
+  if (fs.existsSync(binDir)) {
+    for (const file of fs.readdirSync(binDir)) {
+      const filePath = path.join(binDir, file);
+      if (filePath !== destPath) {
+        fs.unlinkSync(filePath);
+      }
     }
-
-    console.log(`ud v${version} installed successfully!`);
-  } catch (err) {
-    console.error(`Failed to install ud: ${err.message}`);
-    process.exit(1);
   }
+
+  console.log(`ud v${version} installed for ${goos}/${goarch}`);
 }
 
 main();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oatnil/ud",
-  "version": "0.33.0",
-  "description": "UnderControl CLI - task and expense management from the terminal",
+  "version": "0.49.2",
+  "description": "UnDercontrol CLI - task and expense management from the terminal",
   "homepage": "https://github.com/oatnil-top/ud",
   "repository": {
     "type": "git",
@@ -33,6 +33,7 @@
   "files": [
     "install.js",
     "run.js",
+    "bin/",
     "README.md"
   ]
 }