@taleshape/shaper 0.1.1 → 0.1.2

package/bin/shaper

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Get the directory where the script is located
+SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
+BINARY="$SCRIPT_DIR/bin/shaper"
+
+# Execute the binary with all arguments
+exec "$BINARY" "$@" 

package/install.js

@@ -1,6 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
+const crypto = require('crypto');
 const axios = require('axios');
 
 const BIN_DIR = path.join(__dirname, 'bin');
@@ -30,11 +31,9 @@ async function getRelease(version) {
     return response.data;
   } catch (error) {
     if (error.response?.status === 404) {
-      console.error(`Version v${version} not found. Please check if this version exists in the releases.`);
-    } else {
-      console.error('Error fetching release:', error.message);
+      throw new Error(`Version v${version} not found. Please check if this version exists in the releases.`);
     }
-    process.exit(1);
+    throw new Error(`Error fetching release: ${error.message}`);
   }
 }
 
@@ -42,7 +41,9 @@ async function downloadFile(url, dest) {
   const response = await axios({
     method: 'GET',
     url: url,
-    responseType: 'stream'
+    responseType: 'stream',
+    maxContentLength: 100 * 1024 * 1024, // 100MB max
+    validateStatus: status => status === 200
   });
 
   const writer = fs.createWriteStream(dest);
@@ -51,40 +52,94 @@ async function downloadFile(url, dest) {
   return new Promise((resolve, reject) => {
     writer.on('finish', resolve);
     writer.on('error', reject);
+    response.data.on('error', reject);
   });
 }
 
-async function main() {
-  // Create bin directory if it doesn't exist
-  if (!fs.existsSync(BIN_DIR)) {
-    fs.mkdirSync(BIN_DIR, { recursive: true });
-  }
+function calculateSHA256(filePath) {
+  return new Promise((resolve, reject) => {
+    const hash = crypto.createHash('sha256');
+    const stream = fs.createReadStream(filePath);
+    
+    stream.on('error', err => reject(err));
+    stream.on('data', chunk => hash.update(chunk));
+    stream.on('end', () => resolve(hash.digest('hex')));
+  });
+}
 
-  const platform = `${process.platform}-${process.arch}`;
-  const assetName = PLATFORM_MAP[platform];
+async function verifyChecksum(filePath, expectedChecksum) {
+  const actualChecksum = await calculateSHA256(filePath);
+  if (actualChecksum !== expectedChecksum) {
+    throw new Error(`Checksum verification failed for ${path.basename(filePath)}\nExpected: ${expectedChecksum}\nActual:   ${actualChecksum}`);
+  }
+}
 
-  if (!assetName) {
-    console.error(`Unsupported platform: ${platform}`);
-    process.exit(1);
+function loadChecksums() {
+  const checksumsPath = path.join(__dirname, 'bin', 'SHA256SUMS');
+  if (!fs.existsSync(checksumsPath)) {
+    throw new Error('SHA256SUMS file not found in package');
   }
 
+  const checksumsContent = fs.readFileSync(checksumsPath, 'utf8');
+  const checksums = {};
+  checksumsContent.split('\n').forEach(line => {
+    if (line.trim()) {
+      const [checksum, filename] = line.split(/\s+/);
+      checksums[filename] = checksum;
+    }
+  });
+
+  return checksums;
+}
+
+async function main() {
   try {
+    // Create bin directory if it doesn't exist
+    if (!fs.existsSync(BIN_DIR)) {
+      fs.mkdirSync(BIN_DIR, { recursive: true });
+    }
+
+    const platform = `${process.platform}-${process.arch}`;
+    const assetName = PLATFORM_MAP[platform];
+
+    if (!assetName) {
+      throw new Error(`Unsupported platform: ${platform}`);
+    }
+
+    // Load checksums from the package
+    console.log('Loading checksums...');
+    const checksums = loadChecksums();
+    const expectedChecksum = checksums[assetName];
+    
+    if (!expectedChecksum) {
+      throw new Error(`No checksum found for ${assetName} in SHA256SUMS`);
+    }
+
     const release = await getRelease(VERSION);
     const asset = release.assets.find(a => a.name === assetName);
 
     if (!asset) {
-      console.error(`Asset not found for platform ${platform} in version v${VERSION}`);
-      process.exit(1);
+      throw new Error(`Asset not found for platform ${platform} in version v${VERSION}`);
     }
 
     console.log(`Downloading shaper v${VERSION} for ${platform}...`);
     const binaryPath = path.join(BIN_DIR, 'shaper');
     await downloadFile(asset.browser_download_url, binaryPath);
+
+    // Verify checksum
+    console.log('Verifying checksum...');
+    await verifyChecksum(binaryPath, expectedChecksum);
+    console.log('Checksum verified successfully');
+
+    // Set executable permissions
     fs.chmodSync(binaryPath, '755');
 
     console.log('Installation complete!');
   } catch (error) {
-    console.error('Installation failed:', error);
+    console.error('Installation failed:', error.message);
+    // Clean up binary if verification failed
+    const binaryPath = path.join(BIN_DIR, 'shaper');
+    if (fs.existsSync(binaryPath)) fs.unlinkSync(binaryPath);
     process.exit(1);
   }
 }

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@taleshape/shaper",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Minimal Embedded Analytics and Data Platform",
   "main": "index.js",
   "bin": {
-    "shaper": "./shaper.js"
+    "shaper": "./bin/shaper"
   },
   "scripts": {
     "postinstall": "node install.js",
@@ -12,6 +12,8 @@
   },
   "files": [
     "bin",
+    "bin/SHA256SUMS",
+    "shaper.js",
     "index.js",
     "install.js",
     "uninstall.js"

package/shaper.js

@@ -1,20 +0,0 @@
-#!/usr/bin/env node
-
-const path = require('path');
-const { spawn } = require('child_process');
-
-const binaryPath = path.join(__dirname, 'bin', 'shaper');
-
-// Forward all arguments to the binary
-const args = process.argv.slice(2);
-
-// Spawn the binary with the forwarded arguments
-const child = spawn(binaryPath, args, {
-  stdio: 'inherit',
-  shell: false
-});
-
-// Forward the exit code
-child.on('exit', (code) => {
-  process.exit(code);
-});