@bennyblader/ddk-rn 0.2.4 → 0.2.5

package/ddk-ffi/src/uniffi-bindgen.rs

@@ -0,0 +1,3 @@
+fn main() {
+    uniffi::uniffi_bindgen_main()
+}

package/ddk-ffi/uniffi.toml

@@ -0,0 +1,18 @@
+# uniffi.toml
+[bindings.typescript]
+logLevel = "verbose"
+
+[bindings.cpp]
+
+[turbo_module]
+# The name of your Turbo Module as it appears in React Native
+name = "Ddk"
+# The iOS framework name
+ios_framework = "Ddk"
+# The Android package name
+android_package = "dev.bennyblader.ddk"
+
+[namespace.ddk_ffi]
+# Configuration specific to your ddk_ffi namespace
+# This tells the generator how to handle this particular namespace
+js_module_name = "Ddk"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bennyblader/ddk-rn",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "dlcdevkit bindings for react-native",
   "source": "./src/index.tsx",
   "main": "./lib/commonjs/index.js",
@@ -22,6 +22,7 @@
     "src",
     "cpp",
     "lib",
+    "ddk-ffi",
     "android/build.gradle",
     "android/CMakeLists.txt",
     "android/cpp-adapter.cpp",
@@ -33,10 +34,12 @@
     "ios/DdkRn.h",
     "ios/DdkRn.mm",
     "scripts/postinstall.js",
+    "scripts/prepare-rust-src.js",
     "ubrn.config.yaml",
     "*.podspec",
     "react-native.config.js",
     "README.md",
+    "!ddk-ffi/target",
     "!**/*.a",
     "!**/*.so",
     "!**/*.dylib",

package/scripts/postinstall.js

@@ -5,6 +5,7 @@ const path = require('path');
 const { execSync } = require('child_process');
 
 const packageRoot = path.join(__dirname, '..');
+const ddkFfiRoot = path.join(packageRoot, 'ddk-ffi');
 
 console.log('📦 DDK-RN Post-install: Building native libraries...');
 
@@ -52,6 +53,9 @@ function buildIOS() {
   console.log('\n🍎 Building iOS libraries...');
   const uniffiCmd = getUniffiCommand();
   
+  // Update ubrn.config.yaml to point to the included Rust source
+  updateConfigFile();
+  
   try {
     const cmd = `${uniffiCmd} build ios --and-generate`;
     console.log(`Running: ${cmd}`);
@@ -78,6 +82,9 @@ function buildAndroid() {
   
   const uniffiCmd = getUniffiCommand();
   
+  // Update ubrn.config.yaml to point to the included Rust source
+  updateConfigFile();
+  
   try {
     const cmd = `${uniffiCmd} build android --and-generate`;
     console.log(`Running: ${cmd}`);
@@ -92,6 +99,25 @@ function buildAndroid() {
   }
 }
 
+// Update the ubrn.config.yaml to use the local Rust source
+function updateConfigFile() {
+  const configPath = path.join(packageRoot, 'ubrn.config.yaml');
+  
+  if (fs.existsSync(configPath)) {
+    let config = fs.readFileSync(configPath, 'utf8');
+    
+    // Update the Rust directory to point to the included ddk-ffi
+    if (!config.includes('directory: ddk-ffi')) {
+      config = config.replace(
+        /rust:\s*\n\s*directory:\s*[^\n]+/,
+        'rust:\n  directory: ddk-ffi'
+      );
+      fs.writeFileSync(configPath, config);
+      console.log('📝 Updated config to use included Rust source');
+    }
+  }
+}
+
 // Fix the C++ include path issue if needed
 function fixCppIncludePath() {
   const cppFile = path.join(packageRoot, 'cpp', 'bennyblader-ddk-rn.cpp');
@@ -119,7 +145,11 @@ function verifyAllFiles() {
     'src/NativeDdkRn.ts',
     'src/index.tsx',
     'cpp/bennyblader-ddk-rn.cpp',
-    'cpp/bennyblader-ddk-rn.h'
+    'cpp/bennyblader-ddk-rn.h',
+    // Rust source (shipped with package)
+    'ddk-ffi/Cargo.toml',
+    'ddk-ffi/src/lib.rs',
+    'ddk-ffi/src/ddk_ffi.udl'
   ];
   
   const platform = process.platform;
@@ -144,7 +174,7 @@ function verifyAllFiles() {
     if (fs.existsSync(iosFramework)) {
       console.log(`  ✅ ios/DdkRn.xcframework`);
     } else {
-      console.log(`  ⚠️  iOS framework not built yet (will be built on first use)`);
+      console.log(`  ⚠️  iOS framework not built yet (will be built now)`);
     }
   }
   
@@ -189,6 +219,14 @@ async function main() {
     process.exit(1);
   }
   
+  // Check if Rust source is included
+  if (!fs.existsSync(ddkFfiRoot)) {
+    console.error('❌ Rust source not found in package!');
+    console.error(`   Expected at: ${ddkFfiRoot}`);
+    console.error('   This indicates a problem with the NPM package.');
+    process.exit(1);
+  }
+  
   // Verify source files are present (should be included in NPM package)
   const sourceFiles = [
     'src/ddk_ffi.ts',
@@ -198,7 +236,10 @@ async function main() {
     'cpp/ddk_ffi.hpp',
     'cpp/ddk_ffi.cpp',
     'cpp/bennyblader-ddk-rn.cpp',
-    'cpp/bennyblader-ddk-rn.h'
+    'cpp/bennyblader-ddk-rn.h',
+    'ddk-ffi/Cargo.toml',
+    'ddk-ffi/src/lib.rs',
+    'ddk-ffi/src/ddk_ffi.udl'
   ];
   
   console.log('🔍 Checking source files...');
@@ -239,6 +280,7 @@ async function main() {
     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('   - Missing Rust toolchain');
     console.error('');
     console.error('Report issues at: https://github.com/bennyhodl/ddk-ffi/issues');
     process.exit(1);

package/scripts/prepare-rust-src.js

@@ -0,0 +1,51 @@
+#!/usr/bin/env node
+
+const fs = require('fs');
+const path = require('path');
+const { execSync } = require('child_process');
+
+const ddkRnRoot = path.join(__dirname, '..');
+const projectRoot = path.join(ddkRnRoot, '..');
+const ddkFfiSource = path.join(projectRoot, 'ddk-ffi');
+const ddkFfiDest = path.join(ddkRnRoot, 'ddk-ffi');
+
+console.log('📦 Preparing Rust source for npm package...');
+
+function copyDirectory(src, dest) {
+  // Remove existing destination if it exists
+  if (fs.existsSync(dest)) {
+    console.log(`🗑️  Removing existing ${path.basename(dest)}...`);
+    execSync(`rm -rf "${dest}"`, { stdio: 'inherit' });
+  }
+
+  // Create destination directory
+  fs.mkdirSync(dest, { recursive: true });
+
+  // Copy all files except target directory
+  console.log(`📋 Copying ${path.basename(src)} to ${path.basename(dest)}...`);
+  execSync(`rsync -av --exclude=target/ --exclude=.git/ "${src}/" "${dest}/"`, { 
+    stdio: 'inherit' 
+  });
+}
+
+function main() {
+  try {
+    // Check if source exists
+    if (!fs.existsSync(ddkFfiSource)) {
+      console.error(`❌ Source directory not found: ${ddkFfiSource}`);
+      process.exit(1);
+    }
+
+    // Copy the Rust source
+    copyDirectory(ddkFfiSource, ddkFfiDest);
+
+    console.log('✅ Rust source prepared for npm package');
+    console.log(`📁 Location: ${ddkFfiDest}`);
+    
+  } catch (error) {
+    console.error('❌ Failed to prepare Rust source:', error.message);
+    process.exit(1);
+  }
+}
+
+main();