Merge pull request #45 from NiloCK/no-binary-install

remove binary-install dep...

Author: NiloCK

.gitignore

@@ -1,2 +1,8 @@
 # the name of my test builds
 td
+
+node_modules
+
+# npm package build artifacts
+tuido-npm/binary/
+tuido-npm/node_modules/

tuido-npm/install.js

@@ -1,4 +1,3 @@
-const { Binary } = require("binary-install");
 const os = require("os");
 const path = require("path");
 const fs = require("fs");
@@ -32,7 +31,7 @@ function getArch() {
   return mappings[arch] || arch;
 }
 
-function getBinary() {
+function getBinaryInfo() {
   const platform = getPlatform();
   const arch = getArch();
 
@@ -72,67 +71,90 @@ function getBinary() {
   };
 }
 
-async function manualDownload(url, name) {
-  console.log(`\n📥 Attempting manual download as fallback...`);
+async function downloadAndInstall(url, name) {
+  console.log(`\n📥 Downloading and installing binary...`);
 
   const binaryDir = path.join(__dirname, "binary");
   const tarPath = path.join(__dirname, "temp.tar.gz");
   const finalBinaryPath = path.join(binaryDir, name);
 
+
+  
   // Ensure binary directory exists
   if (!fs.existsSync(binaryDir)) {
     fs.mkdirSync(binaryDir, { recursive: true });
-    console.log(`Created binary directory: ${binaryDir}`);
   }
 
   return new Promise((resolve, reject) => {
     console.log(`Downloading from: ${url}`);
 
-    const file = fs.createWriteStream(tarPath);
-    
-    https.get(url, (response) => {
-      if (response.statusCode !== 200) {
-        reject(new Error(`HTTP ${response.statusCode}: ${response.statusMessage}`));
+    const downloadFromUrl = (downloadUrl, redirectCount = 0) => {
+      if (redirectCount > 5) {
+        reject(new Error('Too many redirects'));
         return;
       }
 
-      console.log(`Download started, content-length: ${response.headers['content-length'] || 'unknown'}`);
+      const file = fs.createWriteStream(tarPath);
 
-      response.pipe(file);
-      
-      file.on('finish', () => {
-        file.close();
-        console.log(`Download completed, extracting...`);
+      https.get(downloadUrl, (response) => {
+        if (response.statusCode === 302 || response.statusCode === 301) {
+          console.log(`Following redirect to: ${response.headers.location}`);
+          file.close();
+          fs.unlink(tarPath, () => {});
+          downloadFromUrl(response.headers.location, redirectCount + 1);
+          return;
+        }
 
-        // Extract the tar.gz file
-        tar.extract({
-          file: tarPath,
-          cwd: binaryDir,
-          sync: true
-        });
+        if (response.statusCode !== 200) {
+          file.close();
+          fs.unlink(tarPath, () => {});
+          reject(new Error(`HTTP ${response.statusCode}: ${response.statusMessage}`));
+          return;
+        }
+      
+        console.log(`Download started, content-length: ${response.headers['content-length'] || 'unknown'}`);
 
-        console.log(`Extraction completed`);
+        response.pipe(file);
 
-        // Clean up the tar file
-        fs.unlinkSync(tarPath);
+        file.on('finish', () => {
+          file.close();
+          console.log(`Download completed, extracting...`);
+          
+          // Extract the tar.gz file
+          tar.extract({
+            file: tarPath,
+            cwd: binaryDir,
+            sync: true
+          });
+          
+          // Clean up the tar file
+          fs.unlinkSync(tarPath);
+          
+          // Make binary executable on Unix systems
+          if (process.platform !== 'win32' && fs.existsSync(finalBinaryPath)) {
+            fs.chmodSync(finalBinaryPath, 0o755);
+          }
+          
+          // Verify installation
+          if (fs.existsSync(finalBinaryPath)) {
+            console.log(`✅ Binary successfully installed`);
+            resolve();
+          } else {
+            reject(new Error(`Binary not found after extraction: ${finalBinaryPath}`));
+          }
+        });
 
-        // Make binary executable on Unix systems
-        if (process.platform !== 'win32') {
-          fs.chmodSync(finalBinaryPath, 0o755);
-          console.log(`Made binary executable`);
-        }
+        file.on('error', (err) => {
+          fs.unlink(tarPath, () => {}); // Clean up on error
+          reject(err);
+        });
 
-        resolve();
-      });
-      
-      file.on('error', (err) => {
-        fs.unlink(tarPath, () => {}); // Clean up on error
+      }).on('error', (err) => {
         reject(err);
       });
-      
-    }).on('error', (err) => {
-      reject(err);
-    });
+    };
+    
+    downloadFromUrl(url);
   });
 }
 
@@ -143,59 +165,18 @@ async function install() {
   console.log(`Installation directory: ${__dirname}`);
 
   try {
-    const { url, name } = getBinary();
+    const { url, name } = getBinaryInfo();
 
-    console.log(`\nCreating Binary instance...`);
-    const binary = new Binary(name, url);
-    
-    console.log(`Binary object created successfully`);
     console.log(`Expected binary name: ${name}`);
     console.log(`Expected install location: ${path.join(__dirname, "binary", name)}`);
 
     console.log(`\nStarting download and installation...`);
 
-    let installSuccess = false;
-    
-    // Try binary-install first
-    try {
-      // Wrap the install call to catch any errors
-      const installPromise = new Promise((resolve, reject) => {
-        try {
-          const result = binary.install();
-          
-          // Handle both promise and callback style returns
-          if (result && typeof result.then === 'function') {
-            result.then(resolve).catch(reject);
-          } else {
-            // Assume synchronous success
-            resolve(result);
-          }
-        } catch (error) {
-          reject(error);
-        }
-      });
-      
-      await installPromise;
-      installSuccess = true;
-      console.log(`\n✅ Successfully installed tuido binary using binary-install: ${name}`);
-      
-    } catch (binaryInstallError) {
-      console.log(`\n⚠️  binary-install failed: ${binaryInstallError.message}`);
-      console.log(`Trying manual download fallback...`);
-      
-      try {
-        await manualDownload(url, name);
-        installSuccess = true;
-        console.log(`\n✅ Successfully installed tuido binary using manual download: ${name}`);
-      } catch (manualError) {
-        console.error(`\n❌ Manual download also failed: ${manualError.message}`);
-        throw manualError;
-      }
-    }
+    // Download and install the binary
+    await downloadAndInstall(url, name);
 
     // Verify the binary was actually installed
     const binaryPath = path.join(__dirname, "binary", name);
-    const fs = require("fs");
 
     if (fs.existsSync(binaryPath)) {
       console.log(`✅ Binary verified at: ${binaryPath}`);
@@ -234,7 +215,7 @@ async function install() {
 
     console.error(`\n🔍 Troubleshooting information:`);
     console.error(`1. Check your internet connection`);
-    console.error(`2. Verify the release exists: ${getBinary().url}`);
+    console.error(`2. Verify the release exists: ${getBinaryInfo().url}`);
     console.error(`3. Check if your platform/architecture is supported`);
     console.error(`4. Try manual download from: https://github.com/NiloCK/tuido/releases`);
     console.error(`5. Check npm/yarn proxy settings if behind corporate firewall`);

tuido-npm/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "tuido",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "description": "Terminal interface for managing tasks and todos in [x]it! format",
   "bin": {
     "tuido": "./bin/tuido-cli.js"
@@ -26,7 +26,6 @@
   },
   "homepage": "https://github.com/NiloCK/tuido#readme",
   "dependencies": {
-    "binary-install": "^1.1.0",
     "tar": "^6.0.0"
   },
   "engines": {

tuido-npm/package.json

@@ -14,7 +14,7 @@ import (
 	"time"
 )
 
-const version = "v0.0.16"
+const version = "v0.0.17"
 const ReleaseURL = "https://github.com/NiloCK/tuido/releases/latest"
 const GitHubAPIURL = "https://api.github.com/repos/NiloCK/tuido/releases/latest"