simplejsble 0.0.20 → 0.0.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "simplejsble",
-  "version": "0.0.20",
+  "version": "0.0.21",
   "description": "React Native Bluetooth Low Energy library using SimpleBLE with Nitro Modules",
   "main": "lib/index",
   "module": "lib/index",
@@ -23,10 +23,12 @@
     "react-native.config.js",
     "nitro.json",
     "*.podspec",
+    "scripts/",
     "README.md"
   ],
   "scripts": {
     "prepack": "node scripts/prepare-package.js",
+    "postinstall": "node scripts/postinstall.js",
     "typecheck": "tsc --noEmit",
     "build": "tsc --composite false",
     "clean": "rm -rf android/build android/.cxx android/.gradle lib",

package/scripts/postinstall.js

@@ -0,0 +1,138 @@
+const fs = require('fs');
+const path = require('path');
+
+// Find the project root by looking for package.json with react-native or react-native-macos
+function findProjectRoot() {
+  let currentDir = process.cwd();
+  const maxDepth = 10;
+  let depth = 0;
+
+  while (depth < maxDepth) {
+    const packageJsonPath = path.join(currentDir, 'package.json');
+    if (fs.existsSync(packageJsonPath)) {
+      try {
+        const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+        const deps = { ...packageJson.dependencies, ...packageJson.devDependencies };
+        if (deps['react-native-macos'] || deps['react-native']) {
+          return currentDir;
+        }
+      } catch (e) {
+        // Continue searching
+      }
+    }
+    const parentDir = path.dirname(currentDir);
+    if (parentDir === currentDir) break;
+    currentDir = parentDir;
+    depth++;
+  }
+
+  return null;
+}
+
+// Check if the fix already exists in Podfile
+function hasFix(content) {
+  return content.includes('NativeNitroModules+NewArch.mm') && 
+         content.includes('EXCLUDED_SOURCE_FILE_NAMES');
+}
+
+// Add the fix to the Podfile
+function addFixToPodfile(podfilePath) {
+  let content = fs.readFileSync(podfilePath, 'utf8');
+  
+  if (hasFix(content)) {
+    console.log('✓ Podfile already has the NitroModules fix');
+    return;
+  }
+
+  // Find the post_install block
+  const postInstallRegex = /post_install\s+do\s+\|installer\|/;
+  const match = content.match(postInstallRegex);
+  
+  if (!match) {
+    console.warn('⚠️  Could not find post_install block in Podfile. Please add the fix manually.');
+    return;
+  }
+
+  // Find the end of the post_install block
+  let insertPosition = match.index + match[0].length;
+  let braceCount = 0;
+  let inString = false;
+  let stringChar = null;
+  
+  for (let i = insertPosition; i < content.length; i++) {
+    const char = content[i];
+    const prevChar = i > 0 ? content[i - 1] : '';
+    
+    // Handle string literals
+    if (!inString && (char === '"' || char === "'")) {
+      inString = true;
+      stringChar = char;
+    } else if (inString && char === stringChar && prevChar !== '\\') {
+      inString = false;
+      stringChar = null;
+    }
+    
+    if (!inString) {
+      if (char === '{') braceCount++;
+      if (char === '}') {
+        braceCount--;
+        if (braceCount < 0) {
+          insertPosition = i;
+          break;
+        }
+      }
+    }
+  }
+
+  // The fix code to insert
+  const fixCode = `
+    
+    # Fix for NitroModules: Exclude New Architecture file when not enabled
+    installer.pods_project.targets.each do |target|
+      if target.name == 'NitroModules' && ENV['RCT_NEW_ARCH_ENABLED'] != '1'
+        # Exclude the file from build phase
+        target.source_build_phase.files.each do |file|
+          if file.file_ref && file.file_ref.path && file.file_ref.path.include?('NativeNitroModules+NewArch.mm')
+            file.settings = { 'COMPILER_FLAGS' => '-w' }
+            target.source_build_phase.remove_file_reference(file.file_ref) if file.file_ref
+          end
+        end
+        
+        # Exclude using build settings
+        target.build_configurations.each do |config|
+          excluded_files = config.build_settings['EXCLUDED_SOURCE_FILE_NAMES'] || []
+          excluded_files << '**/NativeNitroModules+NewArch.mm'
+          config.build_settings['EXCLUDED_SOURCE_FILE_NAMES'] = excluded_files.uniq
+        end
+      end
+    end`;
+
+  // Insert the fix before the closing 'end'
+  const beforeEnd = content.substring(0, insertPosition);
+  const afterEnd = content.substring(insertPosition);
+  
+  const newContent = beforeEnd + fixCode + afterEnd;
+  
+  fs.writeFileSync(podfilePath, newContent, 'utf8');
+  console.log('✓ Added NitroModules fix to Podfile');
+}
+
+// Main execution
+const projectRoot = findProjectRoot();
+
+if (!projectRoot) {
+  console.log('⚠️  Could not find React Native project root. Skipping Podfile fix.');
+  process.exit(0);
+}
+
+// Check for macOS Podfile
+const macosPodfile = path.join(projectRoot, 'macos', 'Podfile');
+if (fs.existsSync(macosPodfile)) {
+  addFixToPodfile(macosPodfile);
+}
+
+// Check for iOS Podfile (in case they also use iOS)
+const iosPodfile = path.join(projectRoot, 'ios', 'Podfile');
+if (fs.existsSync(iosPodfile)) {
+  addFixToPodfile(iosPodfile);
+}

package/scripts/prepare-package.js

@@ -0,0 +1,64 @@
+const fs = require('fs');
+const path = require('path');
+
+const packageDir = path.resolve(__dirname, '..');
+const repoRoot = path.resolve(packageDir, '../../..');
+
+// Directories to clean before packing (native build artifacts only, not lib/)
+const dirsToClean = [
+  'android/build',
+  'android/.cxx',
+  'android/.gradle',
+  'ios/build',
+];
+
+// Directories/files to copy from repo root
+const itemsToCopy = [
+  'simpleble',
+  'simpledroidbridge',
+  'cmake',
+  'dependencies',
+  'VERSION',
+];
+
+console.log('Preparing package for npm publish...');
+console.log(`Package dir: ${packageDir}`);
+console.log(`Repo root: ${repoRoot}`);
+
+// Clean build artifacts first
+console.log('\nCleaning build artifacts...');
+dirsToClean.forEach((dir) => {
+  const dirPath = path.join(packageDir, dir);
+  if (fs.existsSync(dirPath)) {
+    fs.rmSync(dirPath, { recursive: true, force: true });
+    console.log(`✓ Cleaned: ${dir}`);
+  }
+});
+console.log('');
+
+itemsToCopy.forEach((item) => {
+  const src = path.join(repoRoot, item);
+  const dest = path.join(packageDir, item);
+
+  if (!fs.existsSync(src)) {
+    console.warn(`Warning: ${src} does not exist, skipping...`);
+    return;
+  }
+
+  // Remove existing copy if it exists
+  if (fs.existsSync(dest)) {
+    fs.rmSync(dest, { recursive: true, force: true });
+  }
+
+  // Copy directory or file
+  const stat = fs.statSync(src);
+  if (stat.isDirectory()) {
+    fs.cpSync(src, dest, { recursive: true });
+    console.log(`✓ Copied directory: ${item}`);
+  } else {
+    fs.copyFileSync(src, dest);
+    console.log(`✓ Copied file: ${item}`);
+  }
+});
+
+console.log('Package preparation complete!');