seabox 0.1.0-beta.4 → 0.1.1

package/lib/rolldown-bundler.mjs

@@ -7,11 +7,9 @@
 import fs from 'fs';
 import path from 'path';
 import { rolldown  as rolldown } from 'rolldown';
-import commonjs from '@rollup/plugin-commonjs';
-import { nodeResolve } from '@rollup/plugin-node-resolve';
-import json from '@rollup/plugin-json';
 import Module from 'module';
 import { fileURLToPath } from 'url';
+import * as diag from './diagnostics.mjs';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -71,21 +69,24 @@ class NativeModuleDetectorPlugin {
   /**
    * Register a native module
    */
-  registerNativeModule(nativePath) {
+  registerNativeModule(nativePath, isPrebuild = false) {
     if (this.nativeModules.has(nativePath)) {
       return this.nativeModules.get(nativePath);
     }
 
     const packageRoot = this.findPackageRoot(nativePath);
     const moduleName = packageRoot ? path.basename(packageRoot) : path.basename(nativePath, '.node');
-    const fileName = path.basename(nativePath);
+    
+    // Use relative path from project root to avoid conflicts and preserve structure
+    const relativeFromProject = path.relative(this.projectRoot, nativePath).replace(/\\/g, '/');
     
     const info = {
       binaryPath: nativePath,
       packageRoot: packageRoot || path.dirname(nativePath),
       moduleName: moduleName,
       buildPath: path.dirname(nativePath),
-      assetKey: `native/${moduleName}/${fileName}`
+      assetKey: relativeFromProject,
+      isPrebuild: isPrebuild  // Track if this is a prebuild (don't rebuild)
     };
 
     this.nativeModules.set(nativePath, info);
@@ -176,7 +177,7 @@ class NativeModuleDetectorPlugin {
               // Pick best match (prefer napi builds)
               const napiFile = nodeFiles.find(f => f.includes('napi')) || nodeFiles[0];
               const nativePath = path.join(platformArchDir, napiFile);
-              const info = self.registerNativeModule(nativePath);
+              const info = self.registerNativeModule(nativePath, true);  // Mark as prebuild
               hasChanges = true;
               return `__requireSeabox('${info.assetKey}')`;
             }
@@ -354,10 +355,8 @@ export async function bundleWithRollup(entryPath, outputPath, config = {}, targe
     projectRoot
   });
   
-  if (verbose) {
-    console.log('[Bundler] Bundling entry:', entryPath);
-    console.log('[Bundler] Target:', `${targetPlatform}-${targetArch}`);
-  }
+  diag.verbose(`Bundling entry: ${entryPath}`);
+  diag.verbose(`Target: ${diag.formatTarget(targetPlatform, targetArch)}`);
 
   // Get Node.js built-in modules to mark as external
   const builtinModules = Module.builtinModules || [];
@@ -367,7 +366,6 @@ export async function bundleWithRollup(entryPath, outputPath, config = {}, targe
     platform: "node",
     plugins: [
       nativeDetector,   
-      json(),
       ...(config.bundler?.plugins || [])
     ],
     external: [
@@ -399,11 +397,9 @@ export async function bundleWithRollup(entryPath, outputPath, config = {}, targe
 
   await bundle.close();
 
-  if (verbose) {
-    console.log('[Bundler] Bundle complete:', outputPath);
-    console.log('[Bundler] Native modules detected:', nativeDetector.nativeModules.size);
-    console.log('[Bundler] Assets detected:', nativeDetector.detectedAssets.size);
-  }
+  diag.verbose(`Bundle complete: ${outputPath}`);
+  diag.verbose(`Native modules detected: ${nativeDetector.nativeModules.size}`);
+  diag.verbose(`Assets detected: ${nativeDetector.detectedAssets.size}`);
 
   return {
     bundledPath: outputPath,

package/lib/unsign.cjs

@@ -9,6 +9,18 @@ const { promisify } = require('util');
 
 const execFileAsync = promisify(execFile);
 
+// Simple verbose logging flag (set by inject.mjs)
+let verboseMode = false;
+function setVerbose(enabled) {
+  verboseMode = enabled;
+}
+
+function logVerbose(message, indent = 2) {
+  if (verboseMode) {
+    console.log('  '.repeat(indent) + message);
+  }
+}
+
 /**
  * Check if a signing tool is available on the system.
  * @param {string} platform - Target platform (win32, linux, darwin)
@@ -106,32 +118,29 @@ async function removeMacSignature(exePath) {
 async function removeSignature(exePath, platform) {
   // Linux binaries are typically not signed, so skip signature removal
   if (platform === 'linux') {
-    console.log('Skipping signature removal (Linux binaries are typically unsigned)');
+    logVerbose('Skipping signature removal (Linux binaries are typically unsigned)');
     return;
   }
   
-  //console.log('Checking for code signature removal tools...');
-  
   const { available, tool } = await checkSignToolAvailability(platform);
   
   if (!available) {
-    console.warn(`⚠️  Warning: Signature removal tool not found for ${platform}`);
-    console.warn(`    Tool needed: ${tool || 'unknown'}`);
-    console.warn(`    The binary may have an existing signature that will be corrupted during injection.`);
+    logVerbose(`[!] Warning: Signature removal tool not found for ${platform}`);
+    logVerbose(`Tool needed: ${tool || 'unknown'}`, 2);
+    logVerbose(`The binary may have an existing signature that will be corrupted during injection.`, 2);
     
     if (platform === 'win32') {
-      console.warn(`    Install Windows SDK to get signtool.exe`);
-      console.warn(`    Download from: https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/`);
+      logVerbose(`Install Windows SDK to get signtool.exe`, 2);
+      logVerbose(`Download from: https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/`, 2);
     } else if (platform === 'darwin') {
-      console.warn(`    Install Xcode Command Line Tools to get codesign`);
-      console.warn(`    Run: xcode-select --install`);
+      logVerbose(`Install Xcode Command Line Tools to get codesign`, 2);
+      logVerbose(`Run: xcode-select --install`, 2);
     }
     
-    console.warn('');
     return;
   }
   
-  console.log(`Found ${tool}, attempting to remove signature...`);
+  logVerbose(`Found ${tool}, attempting to remove signature...`);
   
   let result;
   if (platform === 'win32') {
@@ -139,15 +148,15 @@ async function removeSignature(exePath, platform) {
   } else if (platform === 'darwin') {
     result = await removeMacSignature(exePath);
   } else {
-    console.warn(`⚠️  Warning: Unsupported platform for signature removal: ${platform}`);
+    logVerbose(`[!] Warning: Unsupported platform for signature removal: ${platform}`);
     return;
   }
   
   if (result.success) {
-    console.log(`✓ ${result.message}`);
+    logVerbose(`[✓] ${result.message}`);
   } else {
-    console.warn(`⚠️  Warning: ${result.message}`);
-    console.warn(`    Continuing anyway, but the executable may have signature issues.`);
+    logVerbose(`[!] Warning: ${result.message}`);
+    logVerbose(`Continuing anyway, but the executable may have signature issues.`, 2);
   }
 }
 
@@ -156,4 +165,5 @@ module.exports = {
   checkSignToolAvailability,
   removeWindowsSignature,
   removeMacSignature,
+  setVerbose,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "seabox",
-  "version": "0.1.0-beta.4",
+  "version": "0.1.1",
   "description": "Node.js Single Executable Application (SEA) builder tool with native and library extraction",
   "main": "lib/index.mjs",
   "type": "module",
@@ -20,6 +20,7 @@
     "SEA",
     "native",
     "module",
+    "pkg",
     "dll",
     "packaging",
     "node",
@@ -33,17 +34,20 @@
   },
   "homepage": "https://github.com/MeirionHughes/seabox",
   "dependencies": {
-    "@rollup/plugin-commonjs": "^28.0.2",
-    "@rollup/plugin-json": "^6.1.0",
-    "@rollup/plugin-node-resolve": "^15.3.0",
     "adm-zip": "^0.5.16",
     "glob": "^10.0.0",
     "postject": "^1.0.0-alpha.6",
-    "rcedit": "^4.0.1",
     "rolldown": "^1.0.0-beta.50",
-    "rollup": "^4.28.1",
     "tar": "^6.2.1"
   },
+  "peerDependencies": {
+    "rcedit": "^4.0.1"
+  },
+  "peerDependenciesMeta": {
+    "rcedit": {
+      "optional": true
+    }
+  },
   "devDependencies": {
     "chai": "^6.2.1",
     "javascript-obfuscator": "^4.1.1",