@bennyblader/ddk-rn 0.2.1 → 0.2.3

package/scripts/postinstall.js

@@ -2,48 +2,36 @@
 
 const fs = require('fs');
 const path = require('path');
-const https = require('https');
 const { execSync } = require('child_process');
 
 const packageRoot = path.join(__dirname, '..');
-const packageJson = JSON.parse(fs.readFileSync(path.join(packageRoot, 'package.json'), 'utf8'));
-const version = packageJson.version;
 
-const GITHUB_REPO = 'bennyhodl/ddk-ffi';
-const RELEASE_TAG = `v${version}`;
+console.log('📦 DDK-RN Post-install: Generating turbo modules and building native libraries...');
 
-console.log(`📦 DDK-RN Post-install: Setting up native binaries for v${version}...`);
+// Check if uniffi-bindgen-react-native is available (prefer npx)
+function hasUniffiBingen() {
+  try {
+    execSync('npx uniffi-bindgen-react-native --help', { stdio: 'ignore' });
+    return true;
+  } catch (error) {
+    try {
+      execSync('uniffi-bindgen-react-native --help', { stdio: 'ignore' });
+      return true;
+    } catch (error2) {
+      return false;
+    }
+  }
+}
 
-// Define all required files for verification
-const requiredFiles = {
-  'TypeScript bindings': [
-    'src/ddk_ffi.ts',
-    'src/ddk_ffi-ffi.ts',
-    'src/NativeDdkRn.ts',
-    'src/index.tsx'
-  ],
-  'C++ bindings': [
-    'cpp/ddk_ffi.hpp',
-    'cpp/ddk_ffi.cpp',
-    'cpp/bennyblader-ddk-rn.h',
-    'cpp/bennyblader-ddk-rn.cpp'
-  ],
-  'Android libraries': [
-    'android/src/main/arm64-v8a/libddk_ffi.a',
-    'android/src/main/armeabi-v7a/libddk_ffi.a',
-    'android/src/main/x86/libddk_ffi.a',
-    'android/src/main/x86_64/libddk_ffi.a'
-  ],
-  'iOS framework': [
-    'ios/DdkRn.xcframework/Info.plist',
-    'ios/DdkRn.xcframework/ios-arm64/libddk_ffi.a',
-    'ios/DdkRn.xcframework/ios-arm64-simulator/libddk_ffi.a'
-  ],
-  'JavaScript modules': [
-    'lib/commonjs/index.js',
-    'lib/module/index.js'
-  ]
-};
+// Get the uniffi command (prefer npx)
+function getUniffiCommand() {
+  try {
+    execSync('npx uniffi-bindgen-react-native --help', { stdio: 'ignore' });
+    return 'npx uniffi-bindgen-react-native';
+  } catch (error) {
+    return 'uniffi-bindgen-react-native';
+  }
+}
 
 // Create directories if they don't exist
 function ensureDir(dir) {
@@ -52,178 +40,243 @@ function ensureDir(dir) {
   }
 }
 
-function downloadFile(url, dest) {
-  return new Promise((resolve, reject) => {
-    console.log(`⬇️  Downloading from ${url}...`);
-    
-    const file = fs.createWriteStream(dest);
-    
-    https.get(url, (response) => {
-      if (response.statusCode === 302 || response.statusCode === 301) {
-        // Follow redirect
-        return downloadFile(response.headers.location, dest).then(resolve).catch(reject);
-      }
-      
-      if (response.statusCode !== 200) {
-        reject(new Error(`Failed to download: ${response.statusCode} ${response.statusMessage}`));
-        return;
-      }
-      
-      response.pipe(file);
-      
-      file.on('finish', () => {
-        file.close();
-        console.log(`✅ Downloaded ${path.basename(dest)}`);
-        resolve();
-      });
-    }).on('error', (err) => {
-      fs.unlink(dest, () => {}); // Delete partial file
-      reject(err);
-    });
-  });
-}
-
-function extractTarGz(tarPath, extractDir) {
+// Generate turbo module specifications from existing JSI bindings
+function generateTurboModule() {
+  console.log('\n⚡ Generating turbo module from existing bindings...');
+  
+  const configFile = path.join(packageRoot, 'ubrn.config.yaml');
+  const uniffiCmd = getUniffiCommand();
+  
   try {
-    console.log(`📂 Extracting ${path.basename(tarPath)}...`);
-    execSync(`tar -xzf "${tarPath}" -C "${extractDir}"`, { stdio: 'inherit' });
-    console.log(`✅ Extracted to ${extractDir}`);
+    const cmd = `${uniffiCmd} generate jsi turbo-module ddk_ffi --config "${configFile}" --native-bindings`;
+    console.log(`Running: ${cmd}`);
+    execSync(cmd, { 
+      stdio: 'inherit',
+      cwd: packageRoot 
+    });
+    console.log('✅ Turbo module generated');
   } catch (error) {
-    throw new Error(`Failed to extract ${tarPath}: ${error.message}`);
+    throw new Error(`Failed to generate turbo module: ${error.message}`);
   }
 }
 
-function verifyAllFiles() {
-  console.log('\n🔍 Verifying all required files...');
-  
-  let allFilesPresent = true;
+// Build iOS libraries and create XCFramework
+function buildIOS() {
   const platform = process.platform;
   
-  for (const [category, files] of Object.entries(requiredFiles)) {
-    // Skip iOS files on non-macOS platforms
-    if (category === 'iOS framework' && platform !== 'darwin') {
-      console.log(`\n⚠️  Skipping ${category} verification (not on macOS)`);
-      continue;
-    }
-    
-    console.log(`\n📋 Checking ${category}...`);
-    
-    for (const file of files) {
-      const filePath = path.join(packageRoot, file);
-      if (fs.existsSync(filePath)) {
-        console.log(`  ✅ ${file}`);
-      } else {
-        console.error(`  ❌ Missing: ${file}`);
-        allFilesPresent = false;
-      }
-    }
+  if (platform !== 'darwin') {
+    console.log('\n⚠️  Skipping iOS build (not on macOS)');
+    return;
   }
   
-  return allFilesPresent;
+  console.log('\n🍎 Building iOS libraries...');
+  const uniffiCmd = getUniffiCommand();
+  
+  try {
+    const cmd = `${uniffiCmd} build ios --and-generate`;
+    console.log(`Running: ${cmd}`);
+    execSync(cmd, { 
+      stdio: 'inherit',
+      cwd: packageRoot 
+    });
+    console.log('✅ iOS libraries built');
+  } catch (error) {
+    throw new Error(`Failed to build iOS libraries: ${error.message}`);
+  }
 }
 
-async function downloadAndExtractBinaries() {
-  const platform = process.platform;
+// Build Android libraries
+function buildAndroid() {
+  console.log('\n📱 Building Android libraries...');
+  
+  // Check if Android NDK is available
+  if (!process.env.ANDROID_NDK_ROOT && !process.env.NDK_HOME) {
+    console.log('⚠️  Android NDK not found. Skipping Android build.');
+    console.log('   Set ANDROID_NDK_ROOT or NDK_HOME to build Android libraries.');
+    return;
+  }
+  
+  const uniffiCmd = getUniffiCommand();
   
   try {
-    // Download Android native libraries
-    const androidLibsDir = path.join(packageRoot, 'android', 'src', 'main');
-    ensureDir(androidLibsDir);
-    
-    const androidArchiveUrl = `https://github.com/${GITHUB_REPO}/releases/download/${RELEASE_TAG}/android-jni-libs.tar.gz`;
-    const androidTarPath = path.join(packageRoot, 'android-jni-libs.tar.gz');
-    
-    console.log('\n📱 Setting up Android native libraries...');
-    await downloadFile(androidArchiveUrl, androidTarPath);
-    extractTarGz(androidTarPath, androidLibsDir);
-    fs.unlinkSync(androidTarPath); // Clean up tar file
-    
-    // Download iOS XCFramework (only on macOS)
-    if (platform === 'darwin') {
-      const iosFrameworksDir = path.join(packageRoot, 'ios');
-      ensureDir(iosFrameworksDir);
-      
-      const iosArchiveUrl = `https://github.com/${GITHUB_REPO}/releases/download/${RELEASE_TAG}/ios-xcframeworks.tar.gz`;
-      const iosTarPath = path.join(packageRoot, 'ios-xcframeworks.tar.gz');
-      
-      console.log('\n🍎 Setting up iOS framework...');
-      await downloadFile(iosArchiveUrl, iosTarPath);
-      extractTarGz(iosTarPath, iosFrameworksDir);
-      fs.unlinkSync(iosTarPath); // Clean up tar file
-    } else {
-      console.log('\n⚠️  Skipping iOS framework (not on macOS)');
-    }
-    
+    const cmd = `${uniffiCmd} build android --and-generate`;
+    console.log(`Running: ${cmd}`);
+    execSync(cmd, { 
+      stdio: 'inherit',
+      cwd: packageRoot 
+    });
+    console.log('✅ Android libraries built');
   } catch (error) {
-    console.error('\n❌ Failed to download native binaries:', error.message);
-    console.error('');
-    console.error('📋 Manual installation instructions:');
-    console.error(`   1. Download binaries from: https://github.com/${GITHUB_REPO}/releases/tag/${RELEASE_TAG}`);
-    console.error('   2. Extract android-jni-libs.tar.gz to android/src/main/');
-    console.error('   3. Extract ios-xcframeworks.tar.gz to ios/ (macOS only)');
-    console.error('');
-    console.error('Or report this issue at: https://github.com/bennyhodl/ddk-ffi/issues');
-    
-    // Don't fail the installation completely
-    process.exit(0);
+    console.warn(`⚠️  Android build failed: ${error.message}`);
+    console.warn('   This may be due to missing Android NDK or Rust toolchains.');
   }
 }
 
-async function main() {
-  const platform = process.platform;
-  
-  // Skip in CI unless explicitly requested
-  if (process.env.CI && !process.env.DOWNLOAD_BINARIES) {
-    console.log('⚠️  Skipping binary download in CI environment.');
-    console.log('   Set DOWNLOAD_BINARIES=1 to force download in CI.');
-    process.exit(0);
+// Fix the C++ include path issue
+function fixCppIncludePath() {
+  const cppFile = path.join(packageRoot, 'cpp', 'bennyblader-ddk-rn.cpp');
+  if (fs.existsSync(cppFile)) {
+    let content = fs.readFileSync(cppFile, 'utf8');
+    if (content.includes('#include "/ddk_ffi.hpp"')) {
+      content = content.replace('#include "/ddk_ffi.hpp"', '#include "ddk_ffi.hpp"');
+      fs.writeFileSync(cppFile, content);
+      console.log('🔧 Fixed include path in C++ bindings');
+    }
   }
+}
+
+// Verify all required files are present
+function verifyAllFiles() {
+  console.log('\n🔍 Verifying installation...');
   
-  // Check if binaries already exist
-  const androidLibExists = fs.existsSync(path.join(packageRoot, 'android', 'src', 'main', 'arm64-v8a', 'libddk_ffi.a'));
-  const iosFrameworkExists = fs.existsSync(path.join(packageRoot, 'ios', 'DdkRn.xcframework'));
+  const sourceFiles = [
+    'src/ddk_ffi.ts',
+    'src/ddk_ffi-ffi.ts',
+    'cpp/ddk_ffi.hpp',
+    'cpp/ddk_ffi.cpp'
+  ];
   
-  let needsDownload = false;
+  const generatedFiles = [
+    'src/NativeDdkRn.ts',
+    'src/index.tsx',
+    'cpp/bennyblader-ddk-rn.cpp',
+    'cpp/bennyblader-ddk-rn.h'
+  ];
+  
+  const platform = process.platform;
+  let allFilesPresent = true;
   
-  if (!androidLibExists) {
-    console.log('📱 Android libraries not found, will download...');
-    needsDownload = true;
+  // Check source files (should be included in NPM package)
+  console.log('📋 Checking source files...');
+  for (const file of sourceFiles) {
+    const filePath = path.join(packageRoot, file);
+    if (fs.existsSync(filePath)) {
+      console.log(`  ✅ ${file}`);
+    } else {
+      console.error(`  ❌ Missing: ${file}`);
+      allFilesPresent = false;
+    }
   }
   
-  if (platform === 'darwin' && !iosFrameworkExists) {
-    console.log('🍎 iOS framework not found, will download...');
-    needsDownload = true;
+  // Check generated files (created by postinstall)
+  console.log('📋 Checking generated files...');
+  for (const file of generatedFiles) {
+    const filePath = path.join(packageRoot, file);
+    if (fs.existsSync(filePath)) {
+      console.log(`  ✅ ${file}`);
+    } else {
+      console.error(`  ❌ Missing: ${file}`);
+      allFilesPresent = false;
+    }
   }
   
-  if (needsDownload) {
-    await downloadAndExtractBinaries();
+  // Check platform-specific files
+  if (platform === 'darwin') {
+    console.log('📋 Checking iOS framework...');
+    const iosFramework = path.join(packageRoot, 'ios', 'DdkRn.xcframework', 'Info.plist');
+    if (fs.existsSync(iosFramework)) {
+      console.log(`  ✅ ios/DdkRn.xcframework`);
+    } else {
+      console.error(`  ❌ Missing: ios/DdkRn.xcframework`);
+      allFilesPresent = false;
+    }
   } else {
-    console.log('✅ Native binaries already present.');
+    console.log('📋 Skipping iOS framework check (not on macOS)');
   }
   
-  // Fix the C++ include path issue if needed
-  const cppFile = path.join(packageRoot, 'cpp', 'bennyblader-ddk-rn.cpp');
-  if (fs.existsSync(cppFile)) {
-    let content = fs.readFileSync(cppFile, 'utf8');
-    if (content.includes('#include "/ddk_ffi.hpp"')) {
-      content = content.replace('#include "/ddk_ffi.hpp"', '#include "ddk_ffi.hpp"');
-      fs.writeFileSync(cppFile, content);
-      console.log('\n🔧 Fixed include path in C++ bindings');
+  console.log('📋 Checking Android libraries...');
+  const androidLibs = [
+    'android/src/main/arm64-v8a/libddk_ffi.a',
+    'android/src/main/armeabi-v7a/libddk_ffi.a',
+    'android/src/main/x86/libddk_ffi.a',
+    'android/src/main/x86_64/libddk_ffi.a'
+  ];
+  
+  let androidLibsPresent = 0;
+  for (const lib of androidLibs) {
+    const libPath = path.join(packageRoot, lib);
+    if (fs.existsSync(libPath)) {
+      console.log(`  ✅ ${lib}`);
+      androidLibsPresent++;
+    } else {
+      console.log(`  ⚠️  Missing: ${lib}`);
     }
   }
   
-  // Verify all files are present
-  const allFilesPresent = verifyAllFiles();
+  if (androidLibsPresent === 0) {
+    console.log('  ⚠️  No Android libraries found (may be due to missing NDK)');
+  } else {
+    console.log(`  ✅ Found ${androidLibsPresent}/${androidLibs.length} Android libraries`);
+  }
   
-  if (!allFilesPresent) {
-    console.error('\n❌ Some required files are missing!');
-    console.error('The package installation may have failed.');
-    console.error('Please report this issue at: https://github.com/bennyhodl/ddk-ffi/issues');
+  return allFilesPresent;
+}
+
+async function main() {
+  // Skip in CI unless explicitly requested
+  if (process.env.CI && !process.env.GENERATE_BINDINGS) {
+    console.log('⚠️  Skipping binding generation in CI environment.');
+    console.log('   Set GENERATE_BINDINGS=1 to force generation in CI.');
+    process.exit(0);
+  }
+  
+  // Check prerequisites
+  if (!hasUniffiBingen()) {
+    console.error('❌ uniffi-bindgen-react-native not found!');
+    console.error('   Install it with: npm install -g uniffi-bindgen-react-native');
+    console.error('   Or add it as a dependency in your project.');
     process.exit(1);
   }
   
-  console.log('\n✅ All required files verified!');
-  console.log('🎉 DDK-RN is ready to use!\n');
+  // Verify source files are present (should be included in NPM package)
+  const sourceFiles = [
+    'src/ddk_ffi.ts',
+    'src/ddk_ffi-ffi.ts', 
+    'cpp/ddk_ffi.hpp',
+    'cpp/ddk_ffi.cpp'
+  ];
+  
+  console.log('🔍 Checking source files...');
+  for (const file of sourceFiles) {
+    const filePath = path.join(packageRoot, file);
+    if (!fs.existsSync(filePath)) {
+      console.error(`❌ Missing source file: ${file}`);
+      console.error('   This indicates a problem with the NPM package.');
+      process.exit(1);
+    }
+  }
+  console.log('✅ All source files present');
+  
+  try {
+    // Generate turbo module and build native libraries from existing JSI bindings
+    generateTurboModule();
+    fixCppIncludePath();
+    buildIOS();
+    buildAndroid();
+    
+    // Verify all files are present
+    const allFilesPresent = verifyAllFiles();
+    
+    if (!allFilesPresent) {
+      console.error('\n❌ Some required files are missing!');
+      console.error('The installation may have failed.');
+      process.exit(1);
+    }
+    
+    console.log('\n✅ All files installed successfully!');
+    console.log('🎉 DDK-RN is ready to use!\n');
+    
+  } catch (error) {
+    console.error('\n❌ Failed to complete installation:', error.message);
+    console.error('');
+    console.error('📋 This may be due to:');
+    console.error('   - Missing uniffi-bindgen-react-native (install globally)');
+    console.error('   - Missing Android NDK (for Android builds)');
+    console.error('   - Missing Xcode/iOS toolchain (for iOS builds on macOS)');
+    console.error('');
+    console.error('Report issues at: https://github.com/bennyhodl/ddk-ffi/issues');
+    process.exit(1);
+  }
 }
 
 // Run the main function

package/src/ddk_ffi-ffi.ts

@@ -111,6 +111,9 @@ interface NativeModuleInterface {
     output: Uint8Array,
     uniffi_out_err: UniffiRustCallStatus
   ): number;
+  ubrn_uniffi_ddk_ffi_fn_func_plz_work(
+    uniffi_out_err: UniffiRustCallStatus
+  ): Uint8Array;
   ubrn_uniffi_ddk_ffi_fn_func_sign_fund_transaction_input(
     fundTransaction: Uint8Array,
     privkey: Uint8Array,
@@ -142,6 +145,7 @@ interface NativeModuleInterface {
   ubrn_uniffi_ddk_ffi_checksum_func_get_raw_funding_transaction_input_signature(): number;
   ubrn_uniffi_ddk_ffi_checksum_func_get_total_input_vsize(): number;
   ubrn_uniffi_ddk_ffi_checksum_func_is_dust_output(): number;
+  ubrn_uniffi_ddk_ffi_checksum_func_plz_work(): number;
   ubrn_uniffi_ddk_ffi_checksum_func_sign_fund_transaction_input(): number;
   ubrn_uniffi_ddk_ffi_checksum_func_verify_fund_tx_signature(): number;
   ubrn_uniffi_ddk_ffi_checksum_func_version(): number;

package/src/ddk_ffi.ts

@@ -379,6 +379,19 @@ export function isDustOutput(output: TxOutput): boolean {
     )
   );
 }
+export function plzWork(): string {
+  return FfiConverterString.lift(
+    uniffiCaller.rustCall(
+      /*caller:*/ (callStatus) => {
+        return (() => {
+          console.debug(`-- uniffi_ddk_ffi_fn_func_plz_work`);
+          return nativeModule().ubrn_uniffi_ddk_ffi_fn_func_plz_work;
+        })()(callStatus);
+      },
+      /*liftString:*/ FfiConverterString.lift
+    )
+  );
+}
 export function signFundTransactionInput(
   fundTransaction: Transaction,
   privkey: Array</*u8*/ number>,
@@ -1700,6 +1713,11 @@ function uniffiEnsureInitialized() {
       'uniffi_ddk_ffi_checksum_func_is_dust_output'
     );
   }
+  if (nativeModule().ubrn_uniffi_ddk_ffi_checksum_func_plz_work() !== 32972) {
+    throw new UniffiInternalError.ApiChecksumMismatch(
+      'uniffi_ddk_ffi_checksum_func_plz_work'
+    );
+  }
   if (
     nativeModule().ubrn_uniffi_ddk_ffi_checksum_func_sign_fund_transaction_input() !==
     50531

package/ubrn.config.yaml

@@ -0,0 +1,23 @@
+rust:
+  directory: ../ddk-ffi
+  manifestPath: Cargo.toml
+
+bindings:
+  cpp: cpp
+  ts: src
+
+android:
+  directory: android
+  packageName: com.ddkrn
+
+ios:
+  directory: ios
+  targets:
+    - aarch64-apple-ios
+    - aarch64-apple-ios-sim
+  frameworkName: ios/DdkRn
+
+turboModule:
+  cpp: cpp
+  ts: src
+  spec: NativeDdkRn

package/cpp/bennyblader-ddk-rn.cpp

@@ -1,16 +0,0 @@
-// Generated by uniffi-bindgen-react-native
-#include "bennyblader-ddk-rn.h"
-#include "ddk_ffi.hpp"
-
-namespace bennyblader_ddkrn {
-	using namespace facebook;
-
-	uint8_t installRustCrate(jsi::Runtime &runtime, std::shared_ptr<react::CallInvoker> callInvoker) {
-		NativeDdkFfi::registerModule(runtime, callInvoker);
-		return true;
-	}
-
-	uint8_t cleanupRustCrate(jsi::Runtime &runtime) {
-		return false;
-	}
-}

package/cpp/bennyblader-ddk-rn.h

@@ -1,15 +0,0 @@
-#ifndef BENNYBLADER_DDKRN_H
-#define BENNYBLADER_DDKRN_H
-// Generated by uniffi-bindgen-react-native
-#include <cstdint>
-#include <jsi/jsi.h>
-#include <ReactCommon/CallInvoker.h>
-
-namespace bennyblader_ddkrn {
-  using namespace facebook;
-
-  uint8_t installRustCrate(jsi::Runtime &runtime, std::shared_ptr<react::CallInvoker> callInvoker);
-  uint8_t cleanupRustCrate(jsi::Runtime &runtime);
-}
-
-#endif /* BENNYBLADER_DDKRN_H */

package/src/NativeDdkRn.ts

@@ -1,10 +0,0 @@
-// Generated by uniffi-bindgen-react-native
-import type { TurboModule } from 'react-native';
-import { TurboModuleRegistry } from 'react-native';
-
-export interface Spec extends TurboModule {
-  installRustCrate(): boolean;
-  cleanupRustCrate(): boolean;
-}
-
-export default TurboModuleRegistry.getEnforcing<Spec>('DdkRn');

package/src/index.tsx

@@ -1,41 +0,0 @@
-// Generated by uniffi-bindgen-react-native
-import installer from './NativeDdkRn';
-
-// Register the rust crate with Hermes
-// - the boolean flag ensures this loads exactly once, even if the JS
-//   code is reloaded (e.g. during development with metro).
-let rustInstalled = false;
-if (!rustInstalled) {
-  installer.installRustCrate();
-  rustInstalled = true;
-}
-
-// Export the generated bindings to the app.
-export * from './/ddk_ffi';
-
-// Now import the bindings so we can:
-// - intialize them
-// - export them as namespaced objects as the default export.
-import * as ddk_ffi from './/ddk_ffi';
-
-// Initialize the generated bindings: mostly checksums, but also callbacks.
-// - the boolean flag ensures this loads exactly once, even if the JS code
-//   is reloaded (e.g. during development with metro).
-let initialized = false;
-if (!initialized) {
-  ddk_ffi.default.initialize();
-  initialized = true;
-}
-
-// This provides parity with the index.web.ts version of this file.
-// The web version relies on an asynchronous fetch, which this doesn't
-// need, so we just no-op.
-export async function uniffiInitAsync() {
-  // NOOP.
-}
-
-// Export the crates as individually namespaced objects.
-export default {
-  ddk_ffi,
-};
-