@bennyblader/ddk-rn 0.2.3 → 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.3",
+  "version": "0.2.5",
   "description": "dlcdevkit bindings for react-native",
   "source": "./src/index.tsx",
   "main": "./lib/commonjs/index.js",
@@ -19,11 +19,10 @@
     }
   },
   "files": [
-    "src/ddk_ffi.ts",
-    "src/ddk_ffi-ffi.ts",
-    "cpp/ddk_ffi.hpp",
-    "cpp/ddk_ffi.cpp",
+    "src",
+    "cpp",
     "lib",
+    "ddk-ffi",
     "android/build.gradle",
     "android/CMakeLists.txt",
     "android/cpp-adapter.cpp",
@@ -35,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,8 +5,9 @@ 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: Generating turbo modules and building native libraries...');
+console.log('📦 DDK-RN Post-install: Building native libraries...');
 
 // Check if uniffi-bindgen-react-native is available (prefer npx)
 function hasUniffiBingen() {
@@ -40,26 +41,6 @@ function ensureDir(dir) {
   }
 }
 
-// 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 {
-    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 generate turbo module: ${error.message}`);
-  }
-}
-
 // Build iOS libraries and create XCFramework
 function buildIOS() {
   const platform = process.platform;
@@ -72,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}`);
@@ -98,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}`);
@@ -112,7 +99,26 @@ function buildAndroid() {
   }
 }
 
-// Fix the C++ include path issue
+// 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');
   if (fs.existsSync(cppFile)) {
@@ -129,38 +135,29 @@ function fixCppIncludePath() {
 function verifyAllFiles() {
   console.log('\n🔍 Verifying installation...');
   
-  const sourceFiles = [
+  const requiredFiles = [
+    // Core JSI bindings (shipped with package)
     'src/ddk_ffi.ts',
     'src/ddk_ffi-ffi.ts',
     'cpp/ddk_ffi.hpp',
-    'cpp/ddk_ffi.cpp'
-  ];
-  
-  const generatedFiles = [
+    'cpp/ddk_ffi.cpp',
+    // Generated turbo module files (shipped with package)
     '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;
   let allFilesPresent = 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;
-    }
-  }
-  
-  // Check generated files (created by postinstall)
-  console.log('📋 Checking generated files...');
-  for (const file of generatedFiles) {
+  // Check required files
+  console.log('📋 Checking required files...');
+  for (const file of requiredFiles) {
     const filePath = path.join(packageRoot, file);
     if (fs.existsSync(filePath)) {
       console.log(`  ✅ ${file}`);
@@ -170,18 +167,15 @@ function verifyAllFiles() {
     }
   }
   
-  // Check platform-specific files
+  // Check platform-specific files (generated during postinstall)
   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;
+      console.log(`  ⚠️  iOS framework not built yet (will be built now)`);
     }
-  } else {
-    console.log('📋 Skipping iOS framework check (not on macOS)');
   }
   
   console.log('📋 Checking Android libraries...');
@@ -196,15 +190,12 @@ function verifyAllFiles() {
   for (const lib of androidLibs) {
     const libPath = path.join(packageRoot, lib);
     if (fs.existsSync(libPath)) {
-      console.log(`  ✅ ${lib}`);
       androidLibsPresent++;
-    } else {
-      console.log(`  ⚠️  Missing: ${lib}`);
     }
   }
   
   if (androidLibsPresent === 0) {
-    console.log('  ⚠️  No Android libraries found (may be due to missing NDK)');
+    console.log('  ⚠️  Android libraries not built yet (may be due to missing NDK)');
   } else {
     console.log(`  ✅ Found ${androidLibsPresent}/${androidLibs.length} Android libraries`);
   }
@@ -214,9 +205,9 @@ function verifyAllFiles() {
 
 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.');
+  if (process.env.CI && !process.env.BUILD_NATIVE_LIBS) {
+    console.log('⚠️  Skipping native library builds in CI environment.');
+    console.log('   Set BUILD_NATIVE_LIBS=1 to force builds in CI.');
     process.exit(0);
   }
   
@@ -228,12 +219,27 @@ 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',
     'src/ddk_ffi-ffi.ts', 
+    'src/NativeDdkRn.ts',
+    'src/index.tsx',
     'cpp/ddk_ffi.hpp',
-    'cpp/ddk_ffi.cpp'
+    'cpp/ddk_ffi.cpp',
+    'cpp/bennyblader-ddk-rn.cpp',
+    '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...');
@@ -248,9 +254,10 @@ async function main() {
   console.log('✅ All source files present');
   
   try {
-    // Generate turbo module and build native libraries from existing JSI bindings
-    generateTurboModule();
+    // Fix include path if needed
     fixCppIncludePath();
+    
+    // Build native libraries only (turbo module already generated)
     buildIOS();
     buildAndroid();
     
@@ -263,7 +270,7 @@ async function main() {
       process.exit(1);
     }
     
-    console.log('\n✅ All files installed successfully!');
+    console.log('\n✅ Installation completed successfully!');
     console.log('🎉 DDK-RN is ready to use!\n');
     
   } catch (error) {
@@ -273,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();

package/src/NativeDdkRn.ts

@@ -0,0 +1,10 @@
+// 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

@@ -0,0 +1,41 @@
+// 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,
+};
+