dataset-cli 1.0.0 → 1.0.1

package/bin/launcher.js

@@ -1,26 +1,33 @@
 #!/usr/bin/env node
+const { spawn } = require('child_process');
 const path = require('path');
 const os = require('os');
+const fs = require('fs');
 
-const platformMap = {
-  'darwin-x64': 'darwin-amd64',
-  'darwin-arm64': 'darwin-arm64',
-  'linux-x64': 'linux-amd64',
-  'linux-arm64': 'linux-arm64',
-  'win32-x64': 'windows-amd64.exe'
-};
-
-const platform = `${os.platform()}-${os.arch()}`;
-const binaryName = platformMap[platform] || platform;
+// 1. Determine the extension based on the OS
+const ext = os.platform() === 'win32' ? '.exe' : '';
+// 2. Look for the binary in the same 'bin' folder where launcher.js lives
+const binaryPath = path.join(__dirname, 'dataset-cli' + ext);
 
-const binaryPath = path.join(__dirname, 'bin', binaryName);
+// 3. Safety check: Does the binary actually exist?
+if (!fs.existsSync(binaryPath)) {
+  console.error(`❌ Error: dataset-cli binary not found at ${binaryPath}`);
+  console.error(`Please try reinstalling: npm install -g dataset-cli@latest`);
+  process.exit(1);
+}
 
-const { spawn } = require('child_process');
+// 4. Run the Go binary and pass through all arguments
 const child = spawn(binaryPath, process.argv.slice(2), {
   stdio: 'inherit',
-  cwd: process.cwd()
+  cwd: process.cwd(),
+  shell: true // Added for better compatibility with Windows shells
 });
 
 child.on('exit', (code) => {
-  process.exit(code);
+  process.exit(code || 0);
 });
+
+child.on('error', (err) => {
+  console.error(`❌ Failed to start dataset-cli: ${err.message}`);
+  process.exit(1);
+});

package/package.json

@@ -1,15 +1,19 @@
 {
   "name": "dataset-cli",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Dataset processing CLI tool",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/darshan192004/cli-project.git"
   },
   "bin": {
-    "dataset-cli": "bin/launcher.js"
+    "dataset-cli": "./bin/launcher.js"
   },
   "scripts": {
-    "postinstall": "node scripts/install.js"
-  }
+    "postinstall": "node ./scripts/install.js"
+  },
+  "files": [
+    "bin/",
+    "scripts/"
+  ]
 }

package/scripts/install.js

@@ -3,59 +3,70 @@ const fs = require('fs');
 const path = require('path');
 const os = require('os');
 const https = require('https');
-const { execSync } = require('child_process');
 
+// 1. Fixed Map to match your release.yml naming exactly
 const platformMap = {
   'darwin-x64': 'darwin-amd64',
   'darwin-arm64': 'darwin-arm64',
   'linux-x64': 'linux-amd64',
   'linux-arm64': 'linux-arm64',
-  'win32-x64': 'windows-amd64.exe'
+  'win32-x64': 'windows-amd64.exe',
+  'win32-arm64': 'windows-arm64.exe' // Added for safety
 };
 
 const platform = `${os.platform()}-${os.arch()}`;
-const binaryName = platformMap[platform];
+const suffix = platformMap[platform];
 
-if (!binaryName) {
-  console.error(`Unsupported platform: ${platform}`);
+if (!suffix) {
+  console.error(`❌ Unsupported platform: ${platform}`);
   process.exit(1);
 }
 
-const installDir = path.join(__dirname, 'bin');
-const binaryPath = path.join(installDir, binaryName);
+const installDir = path.join(__dirname, '..', 'bin');
+const fullBinaryName = `dataset-cli-${suffix}`;
+const destPath = path.join(installDir, os.platform() === 'win32' ? 'dataset-cli.exe' : 'dataset-cli');
 
-if (fs.existsSync(binaryPath)) {
-  return;
+// 2. Clear previous failed attempts
+if (!fs.existsSync(installDir)) {
+  fs.mkdirSync(installDir, { recursive: true });
 }
 
-const version = require(path.join(__dirname, '..', 'package.json')).version;
+// 3. Get version from package.json
+const packageJson = require(path.join(__dirname, '..', 'package.json'));
+const version = packageJson.version;
 const repo = 'darshan192004/cli-project';
-const downloadUrl = `https://github.com/${repo}/releases/download/v${version}/dataset-cli-${binaryName}`;
+const downloadUrl = `https://github.com/${repo}/releases/download/v${version}/${fullBinaryName}`;
 
-console.log(`Downloading dataset-cli v${version} for ${platform}...`);
+console.log(`☁️ Downloading dataset-cli v${version} for ${platform}...`);
 
-const file = fs.createWriteStream(binaryPath);
+function download(url) {
+  https.get(url, (res) => {
+    // Handle Redirects (Important for GitHub)
+    if (res.statusCode === 301 || res.statusCode === 302) {
+      return download(res.headers.location);
+    }
+
+    if (res.statusCode !== 200) {
+      console.error(`❌ Download failed! HTTP Status: ${res.statusCode}`);
+      console.error(`URL attempted: ${url}`);
+      process.exit(1);
+    }
+
+    const file = fs.createWriteStream(destPath);
+    res.pipe(file);
 
-https.get(downloadUrl, (response) => {
-  if (response.statusCode === 302 || response.statusCode === 301) {
-    https.get(response.headers.location, (redirectResponse) => {
-      redirectResponse.pipe(file);
-      file.on('finish', () => {
-        file.close();
-        fs.chmodSync(binaryPath, 0o755);
-        console.log(`Installed dataset-cli v${version}`);
-      });
-    });
-  } else {
-    response.pipe(file);
     file.on('finish', () => {
       file.close();
-      fs.chmodSync(binaryPath, 0o755);
-      console.log(`Installed dataset-cli v${version}`);
+      // 4. Only chmod on Non-Windows systems
+      if (os.platform() !== 'win32') {
+        fs.chmodSync(destPath, 0o755);
+      }
+      console.log(`✅ Success! Installed to ${destPath}`);
     });
-  }
-}).on('error', (err) => {
-  fs.unlink(binaryPath, () => {});
-  console.error(`Failed to download: ${err.message}`);
-  process.exit(1);
-});
+  }).on('error', (err) => {
+    console.error(`❌ Request Error: ${err.message}`);
+    process.exit(1);
+  });
+}
+
+download(downloadUrl);