@bobfrankston/msger 0.1.116 → 0.1.117

package/msger-native/build-pi.ts

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
-import { execSync } from 'child_process';
+import { spawn } from 'child_process';
+import { styleText } from 'node:util';
+import dns from 'dns/promises';
 import fs from 'fs';
 import path from 'path';
 import packageJson from '../package.json' with { type: 'json' };
@@ -8,21 +10,90 @@ import packageJson from '../package.json' with { type: 'json' };
 const PI_HOST = 'pi4c';  // or 'pi@raspberrypi.local' or 'pi@192.168.1.xxx'
 const PI_BUILD_DIR = '/tmp/msger-native-build';
 
+/**
+ * Run SSH command using spawn to avoid quoting issues
+ * @param args - Command arguments (e.g., ['pi4c', 'echo Connected'])
+ * @param options - Spawn options
+ * @returns Promise that resolves on success
+ */
+function ssh(...args: string[]): Promise<void> {
+    return new Promise((resolve, reject) => {
+        const proc = spawn('ssh', args, { stdio: 'inherit' });
+        proc.on('close', (code) => {
+            if (code === 0) {
+                resolve();
+            } else {
+                reject(new Error(`SSH command failed with code ${code}`));
+            }
+        });
+        proc.on('error', reject);
+    });
+}
+
+/**
+ * Run SCP command using spawn to avoid quoting issues
+ * @param args - Command arguments (e.g., ['file.txt', 'pi4c:/tmp/'])
+ * @param options - Spawn options
+ * @returns Promise that resolves on success
+ */
+function scp(...args: string[]): Promise<void> {
+    return new Promise((resolve, reject) => {
+        const proc = spawn('scp', args, { stdio: 'inherit' });
+        proc.on('close', (code) => {
+            if (code === 0) {
+                resolve();
+            } else {
+                reject(new Error(`SCP command failed with code ${code}`));
+            }
+        });
+        proc.on('error', reject);
+    });
+}
+
+/**
+ * Run SSH command and capture output
+ * @param args - Command arguments
+ * @returns Promise that resolves with stdout
+ */
+function sshCapture(...args: string[]): Promise<string> {
+    return new Promise((resolve, reject) => {
+        let stdout = '';
+        const proc = spawn('ssh', args, { stdio: ['ignore', 'pipe', 'pipe'] });
+        proc.stdout.on('data', (data) => stdout += data.toString());
+        proc.on('close', (code) => {
+            if (code === 0) {
+                resolve(stdout);
+            } else {
+                reject(new Error(`SSH command failed with code ${code}`));
+            }
+        });
+        proc.on('error', reject);
+    });
+}
+
 console.log('🦾 Building ARM64 binary via SSH to Raspberry Pi...');
 console.log(`📍 Target: ${PI_HOST}`);
 
+// Debug: Test DNS resolution first
+console.log('🔍 Testing DNS resolution...');
+try {
+    const result = await dns.lookup(PI_HOST);
+    console.log(`✅ DNS lookup successful: ${PI_HOST} -> ${result.address} (family: IPv${result.family})`);
+} catch (error: any) {
+    console.log(`⚠️  DNS lookup failed for ${PI_HOST}: ${error.message}`);
+    console.log('   Continuing anyway - SSH may have its own resolution...');
+}
+
 try {
     // Test SSH connection
     console.log('🔍 Testing SSH connection...');
-    execSync(`ssh ${PI_HOST} "echo Connected"`, { stdio: 'pipe', timeout: 5000 });
+    await sshCapture(PI_HOST, 'echo Connected');
     console.log('✅ SSH connection successful');
 } catch (error) {
     // Yellow/orange banner for warning (not an error)
-    console.log('\x1b[93m\x1b[40m');  // Bright yellow on black
-    console.log('╔════════════════════════════════════════════════════════════════╗');
-    console.log('║  ℹ️  RASPBERRY PI NOT AVAILABLE - SKIPPING ARM64 BUILD       ║');
-    console.log('╚════════════════════════════════════════════════════════════════╝');
-    console.log('\x1b[0m');  // Reset colors
+    console.log(styleText(['yellow', 'bold'], '╔════════════════════════════════════════════════════════════════╗'));
+    console.log(styleText(['yellow', 'bold'], '║  ℹ️  RASPBERRY PI NOT AVAILABLE - SKIPPING ARM64 BUILD       ║'));
+    console.log(styleText(['yellow', 'bold'], '╚════════════════════════════════════════════════════════════════╝'));
     console.log('');
     console.log(`Cannot connect to Pi: ${PI_HOST}`);
     console.log('To enable Pi builds:');
@@ -36,7 +107,7 @@ try {
 
 // Create build directory on Pi
 console.log('📁 Creating build directory on Pi...');
-execSync(`ssh ${PI_HOST} "mkdir -p ${PI_BUILD_DIR}/src"`, { stdio: 'inherit' });
+await ssh(PI_HOST, `mkdir -p ${PI_BUILD_DIR}/src`);
 
 // Check if build is needed (compare source file mtimes with existing binary)
 console.log('🔍 Checking if build is needed...');
@@ -76,60 +147,52 @@ if (fs.existsSync(destPath)) {
 
 // Copy source files to Pi
 console.log('📤 Copying source files to Pi...');
-execSync(`scp Cargo.toml ${PI_HOST}:${PI_BUILD_DIR}/`, { stdio: 'inherit', cwd: import.meta.dirname });
-execSync(`scp -r src/* ${PI_HOST}:${PI_BUILD_DIR}/src/`, { stdio: 'inherit', cwd: import.meta.dirname });
+const origDir = process.cwd();
+process.chdir(import.meta.dirname);
+await scp('Cargo.toml', `${PI_HOST}:${PI_BUILD_DIR}/`);
+await scp('-r', 'src/*', `${PI_HOST}:${PI_BUILD_DIR}/src/`);
+process.chdir(origDir);
 
 // Check for C compiler (gcc/cc) on Pi
 console.log('🔍 Checking for C compiler on Pi...');
 try {
-    execSync(`ssh ${PI_HOST} "command -v gcc"`, { stdio: 'pipe' });
+    await sshCapture(PI_HOST, 'command -v gcc');
     console.log('✅ C compiler found');
 } catch {
-    console.log('📦 Installing build-essential (C compiler, make, etc.) on Pi...');
-    execSync(`ssh ${PI_HOST} "sudo apt-get update && sudo apt-get install -y build-essential"`, { stdio: 'inherit' });
-    console.log('✅ build-essential installed');
+    console.log('⚠️  C compiler not found - build will likely fail');
+    console.log('   To fix: ssh pi4c "sudo apt-get install -y build-essential"');
 }
 
 // Check for Rust on Pi
 console.log('🔍 Checking for Rust/Cargo on Pi...');
 try {
-    execSync(`ssh ${PI_HOST} "command -v cargo"`, { stdio: 'pipe' });
+    await sshCapture(PI_HOST, 'source ~/.cargo/env 2>/dev/null; command -v cargo');
     console.log('✅ Rust/Cargo found');
 } catch {
-    console.log('📦 Installing Rust on Pi...');
-    execSync(`ssh ${PI_HOST} "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y"`, { stdio: 'inherit' });
-    console.log('✅ Rust installed successfully');
+    console.log('⚠️  Rust not found - build will fail');
+    console.log('   To fix: ssh pi4c "curl --proto \'=https\' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y"');
+    process.exit(0);
 }
 
 // Ensure pkg-config is installed first (required to check for other dependencies)
 console.log('🔧 Ensuring pkg-config is installed on Pi...');
 try {
-    execSync(`ssh ${PI_HOST} "command -v pkg-config"`, { stdio: 'pipe' });
+    await sshCapture(PI_HOST, 'command -v pkg-config');
     console.log('✅ pkg-config found');
 } catch {
-    console.log('📦 Installing pkg-config on Pi...');
-    execSync(`ssh ${PI_HOST} "sudo apt-get update && sudo apt-get install -y pkg-config"`, { stdio: 'inherit' });
-    console.log('✅ pkg-config installed');
+    console.log('⚠️  pkg-config not found - build will likely fail');
+    console.log('   To fix: ssh pi4c "sudo apt-get install -y pkg-config"');
 }
 
 // Check for build dependencies on Pi
 console.log('🔍 Checking for build dependencies on Pi...');
 try {
     // Check for all required libraries: glib, gobject, gio, gtk, webkit
-    execSync(`ssh ${PI_HOST} "pkg-config --exists glib-2.0 gobject-2.0 gio-2.0 gtk+-3.0 && (pkg-config --exists webkit2gtk-4.1 || pkg-config --exists webkit2gtk-4.0)"`, { stdio: 'pipe' });
+    await sshCapture(PI_HOST, 'pkg-config --exists glib-2.0 gobject-2.0 gio-2.0 gtk+-3.0 && (pkg-config --exists webkit2gtk-4.1 || pkg-config --exists webkit2gtk-4.0)');
     console.log('✅ Build dependencies found');
 } catch {
-    console.log('📦 Installing build dependencies on Pi...');
-    // Install all required development packages
-    // Try webkit2gtk-4.1 first (newer), fallback to 4.0 if not available
-    try {
-        execSync(`ssh ${PI_HOST} "sudo apt-get install -y libglib2.0-dev libgtk-3-dev libwebkit2gtk-4.1-dev"`, { stdio: 'inherit' });
-        console.log('✅ Build dependencies installed (webkit2gtk-4.1)');
-    } catch {
-        console.log('ℹ️  webkit2gtk-4.1 not available, trying 4.0...');
-        execSync(`ssh ${PI_HOST} "sudo apt-get install -y libglib2.0-dev libgtk-3-dev libwebkit2gtk-4.0-dev libsoup2.4-dev"`, { stdio: 'inherit' });
-        console.log('✅ Build dependencies installed (webkit2gtk-4.0)');
-    }
+    console.log('⚠️  Build dependencies not found - build will likely fail');
+    console.log('   To fix: ssh pi4c "sudo apt-get install -y libglib2.0-dev libgtk-3-dev libwebkit2gtk-4.1-dev"');
 }
 
 // Get NPM version from imported package.json
@@ -138,20 +201,19 @@ console.log(`📋 Package version: ${npmVersion}`);
 
 // Copy package.json to Pi (needed for version)
 console.log('📤 Copying package.json to Pi...');
-execSync(`scp package.json ${PI_HOST}:${PI_BUILD_DIR}/`, { stdio: 'inherit', cwd: import.meta.dirname });
+process.chdir(import.meta.dirname);
+await scp('package.json', `${PI_HOST}:${PI_BUILD_DIR}/`);
+process.chdir(origDir);
 
 // Build on Pi
 console.log('\n📦 Building ARM64 binary on Pi...');
 try {
     // Source cargo env and build (ensures cargo can find all its dependencies including cc)
     // Export NPM_VERSION for Rust build
-    execSync(`ssh ${PI_HOST} "cd ${PI_BUILD_DIR} && source ~/.cargo/env && export PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig:/usr/share/pkgconfig && export NPM_VERSION=${npmVersion} && cargo build --release"`, { stdio: 'inherit' });
+    await ssh(PI_HOST, `cd ${PI_BUILD_DIR} && source ~/.cargo/env && export PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig:/usr/share/pkgconfig && export NPM_VERSION=${npmVersion} && cargo build --release`);
     console.log('✅ ARM64 build completed');
 } catch (error: any) {
     console.error('❌ Pi build failed:');
-    console.error(error.stdout?.toString());
-    console.error(error.stderr?.toString());
-    console.error('');
     console.error('⚠️  Continuing without Pi binary...');
     process.exit(0);  // Exit gracefully to not break overall build
 }
@@ -163,7 +225,7 @@ if (!fs.existsSync(destDir)) {
     fs.mkdirSync(destDir, { recursive: true });
 }
 
-execSync(`scp ${PI_HOST}:${PI_BUILD_DIR}/target/release/msgernative ${destPath}`, { stdio: 'inherit' });
+await scp(`${PI_HOST}:${PI_BUILD_DIR}/target/release/msgernative`, destPath);
 
 // Set execute permissions
 fs.chmodSync(destPath, 0o755);
@@ -175,6 +237,6 @@ console.log(`📊 Binary size: ${sizeMB} MB`);
 
 // Cleanup on Pi
 console.log('🧹 Cleaning up on Pi...');
-execSync(`ssh ${PI_HOST} "rm -rf ${PI_BUILD_DIR}"`, { stdio: 'inherit' });
+await ssh(PI_HOST, `rm -rf ${PI_BUILD_DIR}`);
 
 console.log('\n🎉 ARM64 build process completed!');

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@bobfrankston/msger",
-    "version": "0.1.116",
+    "version": "0.1.117",
     "description": "Fast, lightweight, cross-platform message box - Rust-powered alternative to msgview",
     "type": "module",
     "main": "./index.js",