reactoradar 1.5.5 → 1.5.7

package/README.md

@@ -145,6 +145,32 @@ npx reactoradar remove
 - Deep equality comparison (no false positives from reference changes)
 - Time travel with ◀ ▶ navigation
 
+### Redux Setup
+
+`npx reactoradar setup` auto-detects Redux and patches your store. If it can't auto-patch, add manually:
+
+**Redux Toolkit (configureStore):**
+```js
+// In your store file (e.g. src/store/store.ts)
+import { configureStore } from '@reduxjs/toolkit';
+
+export const store = configureStore({
+  reducer: rootReducer,
+  middleware: (getDefaultMiddleware) =>
+    __DEV__
+      ? getDefaultMiddleware().concat(require('../debug/RNDebugSDK').reduxMiddleware)
+      : getDefaultMiddleware(),
+});
+```
+
+**Legacy Redux (createStore):**
+```js
+import { reduxEnhancer } from '../debug/RNDebugSDK';
+const store = createStore(reducer, __DEV__ ? reduxEnhancer : undefined);
+```
+
+> **Note:** The import path is relative from your store file to `src/debug/RNDebugSDK`. Adjust if your store is in a different directory. Run `npx reactoradar setup` to auto-detect the correct path.
+
 ## Themes
 
 9 built-in themes: **Dark** (default), **Light**, **Monokai**, **Dracula**, **Solarized Dark**, **Solarized Light**, **Nord**, **GitHub Dark**, **One Dark**

package/bin/setup.js

@@ -166,10 +166,18 @@ async function install(projectDir) {
   const sdkDestDir = path.join(projectDir, 'src', 'debug');
   const sdkDest = path.join(sdkDestDir, 'RNDebugSDK.js');
 
-  if (!dirExists(path.join(projectDir, 'src'))) {
-    fs.mkdirSync(path.join(projectDir, 'src'), { recursive: true });
+  if (!fileExists(sdkSrc)) {
+    err('SDK source file not found at: ' + sdkSrc);
+    err('This may be a corrupted installation. Try: npm cache clean --force && npx reactoradar@latest setup');
+    process.exit(1);
+  }
+
+  try {
+    fs.mkdirSync(sdkDestDir, { recursive: true });
+  } catch (e) {
+    err('Failed to create directory ' + sdkDestDir + ': ' + e.message);
+    process.exit(1);
   }
-  fs.mkdirSync(sdkDestDir, { recursive: true });
 
   // Read SDK, patch HOST
   let sdkContent = fs.readFileSync(sdkSrc, 'utf8');
@@ -177,7 +185,18 @@ async function install(projectDir) {
     /const HOST = '[^']+';/,
     `const HOST = '${host}';`
   );
-  fs.writeFileSync(sdkDest, sdkContent);
+  try {
+    fs.writeFileSync(sdkDest, sdkContent);
+  } catch (e) {
+    err('Failed to write SDK file to ' + sdkDest + ': ' + e.message);
+    process.exit(1);
+  }
+
+  // Verify the file was actually written
+  if (!fileExists(sdkDest)) {
+    err('SDK file was not created at ' + sdkDest + ' — check directory permissions');
+    process.exit(1);
+  }
   log('Copied RNDebugSDK.js →', C.dim + 'src/debug/RNDebugSDK.js' + C.reset);
 
   // 4. Patch entry file
@@ -207,56 +226,91 @@ ${SDK_MARKER_END}
     }
   }
 
-  // 5. Detect and wire Redux
-  info('Checking for Redux...');
-  const hasRedux = allDeps['@reduxjs/toolkit'] || allDeps['redux'];
-  if (hasRedux) {
-    const storeFile = findStoreFile(projectDir);
-    if (storeFile) {
-      const storePath = path.join(projectDir, storeFile);
-      const storeContent = fs.readFileSync(storePath, 'utf8');
-
-      if (storeContent.includes('RNDebugSDK')) {
-        log('Redux store already has RNDebugSDK wired — skipping');
-      } else if (storeContent.includes('configureStore')) {
-        // RTK configureStore
-        const patchedStore = `${SDK_MARKER_START}\nimport { reduxMiddleware } from '../debug/RNDebugSDK';\n${SDK_MARKER_END}\n` + storeContent;
-
-        // Try to add middleware to configureStore
-        if (storeContent.includes('middleware:') || storeContent.includes('middleware :')) {
-          warn('Redux store found at', C.bold + storeFile + C.reset, '— has custom middleware');
-          console.log(C.dim + '    Add manually to your middleware:' + C.reset);
-          console.log(C.dim + '      import { reduxMiddleware } from \'./src/debug/RNDebugSDK\';' + C.reset);
-          console.log(C.dim + '      middleware: (getDefault) => __DEV__' + C.reset);
-          console.log(C.dim + '        ? getDefault().concat(reduxMiddleware)' + C.reset);
-          console.log(C.dim + '        : getDefault(),' + C.reset);
-        } else {
-          // Add middleware field to configureStore
-          const patched = storeContent.replace(
-            /(configureStore\s*\(\s*\{)/,
-            `$1\n  middleware: (getDefaultMiddleware) =>\n    __DEV__\n      ? getDefaultMiddleware().concat(require('./src/debug/RNDebugSDK').reduxMiddleware)\n      : getDefaultMiddleware(),`
-          );
-          if (patched !== storeContent) {
-            fs.writeFileSync(storePath, patched);
-            log('Patched', C.bold + storeFile + C.reset, '— Redux middleware wired');
-          } else {
-            warn('Could not auto-patch', storeFile, '— wire Redux manually');
-          }
-        }
-      } else if (storeContent.includes('createStore')) {
-        warn('Legacy createStore found at', C.bold + storeFile + C.reset);
-        console.log(C.dim + '    Add manually:' + C.reset);
-        console.log(C.dim + '      import { reduxEnhancer } from \'./src/debug/RNDebugSDK\';' + C.reset);
-        console.log(C.dim + '      const store = createStore(reducer, __DEV__ ? reduxEnhancer : undefined);' + C.reset);
-      }
-    } else {
-      warn('Redux detected but store file not found automatically');
-      console.log(C.dim + '    Add to your store setup:' + C.reset);
-      console.log(C.dim + '      import { reduxMiddleware } from \'./src/debug/RNDebugSDK\';' + C.reset);
-    }
-  } else {
-    log('No Redux detected — skipping');
-  }
+   // 5. Detect and wire Redux
+   info('Checking for Redux...');
+   const hasRedux = allDeps['@reduxjs/toolkit'] || allDeps['redux'];
+   if (hasRedux) {
+     const storeFile = findStoreFile(projectDir);
+     if (storeFile) {
+       const storePath = path.join(projectDir, storeFile);
+       const storeContent = fs.readFileSync(storePath, 'utf8');
+
+       // Compute relative path from store file to SDK
+       const storeDir = path.dirname(path.join(projectDir, storeFile));
+       let relSDK = path.relative(storeDir, path.join(projectDir, 'src', 'debug', 'RNDebugSDK'))
+         .replace(/\\/g, '/'); // Windows compat
+       if (!relSDK.startsWith('.')) relSDK = './' + relSDK;
+
+       if (storeContent.includes('RNDebugSDK')) {
+         // Check if the require path is correct — fix stale/wrong paths from older setup versions
+         const wrongPathRe = /require\(['"]([^'"]*RNDebugSDK[^'"]*)['"]\)/g;
+         let hasWrongPath = false;
+         let fixedContent = storeContent;
+         let match;
+         while ((match = wrongPathRe.exec(storeContent)) !== null) {
+           const existingPath = match[1];
+           // Normalize: strip .js extension for comparison
+           const normalizedExisting = existingPath.replace(/\.js$/, '');
+           const normalizedExpected = relSDK.replace(/\.js$/, '');
+           if (normalizedExisting !== normalizedExpected) {
+             hasWrongPath = true;
+             fixedContent = fixedContent.replace(match[0], `require('${relSDK}')`);
+           }
+         }
+         // Also fix import statements
+         const wrongImportRe = /from\s+['"]([^'"]*RNDebugSDK[^'"]*)['"]/g;
+         while ((match = wrongImportRe.exec(storeContent)) !== null) {
+           const existingPath = match[1];
+           const normalizedExisting = existingPath.replace(/\.js$/, '');
+           const normalizedExpected = relSDK.replace(/\.js$/, '');
+           if (normalizedExisting !== normalizedExpected) {
+             hasWrongPath = true;
+             fixedContent = fixedContent.replace(match[0], `from '${relSDK}'`);
+           }
+         }
+         if (hasWrongPath) {
+           fs.writeFileSync(storePath, fixedContent);
+           log('Fixed stale SDK path in', C.bold + storeFile + C.reset, '→', C.cyan + relSDK + C.reset);
+         } else {
+           log('Redux store already has RNDebugSDK wired correctly — skipping');
+         }
+       } else if (storeContent.includes('configureStore')) {
+         // RTK configureStore
+         // Try to add middleware to configureStore
+         if (storeContent.includes('middleware:') || storeContent.includes('middleware :')) {
+           warn('Redux store found at', C.bold + storeFile + C.reset, '— has custom middleware');
+           console.log(C.dim + '    Add manually to your middleware:' + C.reset);
+           console.log(C.dim + `      import { reduxMiddleware } from '${relSDK}';` + C.reset);
+           console.log(C.dim + '      middleware: (getDefault) => __DEV__' + C.reset);
+           console.log(C.dim + '        ? getDefault().concat(reduxMiddleware)' + C.reset);
+           console.log(C.dim + '        : getDefault(),' + C.reset);
+         } else {
+           // Add middleware field to configureStore
+           const patched = storeContent.replace(
+             /(configureStore\s*\(\s*\{)/,
+             `$1\n  middleware: (getDefaultMiddleware) =>\n    __DEV__\n      ? getDefaultMiddleware().concat(require('${relSDK}').reduxMiddleware)\n      : getDefaultMiddleware(),`
+           );
+           if (patched !== storeContent) {
+             fs.writeFileSync(storePath, patched);
+             log('Patched', C.bold + storeFile + C.reset, '— Redux middleware wired');
+           } else {
+             warn('Could not auto-patch', storeFile, '— wire Redux manually');
+           }
+         }
+       } else if (storeContent.includes('createStore')) {
+         warn('Legacy createStore found at', C.bold + storeFile + C.reset);
+         console.log(C.dim + '    Add manually:' + C.reset);
+         console.log(C.dim + `      import { reduxEnhancer } from '${relSDK}';` + C.reset);
+         console.log(C.dim + '      const store = createStore(reducer, __DEV__ ? reduxEnhancer : undefined);' + C.reset);
+       }
+     } else {
+       warn('Redux detected but store file not found automatically');
+       console.log(C.dim + '    Add to your store setup:' + C.reset);
+       console.log(C.dim + '      import { reduxMiddleware } from \'./src/debug/RNDebugSDK\';' + C.reset);
+     }
+   } else {
+     log('No Redux detected — skipping');
+   }
 
   // 6. adb reverse for Android
   if (platform.hasAndroidEmu || platform.hasAndroidDevice) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "reactoradar",
   "productName": "ReactoRadar",
-  "version": "1.5.5",
+  "version": "1.5.7",
   "description": "macOS debugger for React Native — Console, Sources, Network, Performance, Memory, Redux, AsyncStorage, React tree. Supports RN 0.74+ with Hermes and New Architecture.",
   "main": "main.js",
   "bin": {

package/sdk/RNDebugSDK.js

@@ -15,7 +15,7 @@
  */
 
 if (!__DEV__) {
-  module.exports = { reduxEnhancer: x => x, watchAsyncStorage: () => {} };
+  module.exports = { reduxEnhancer: x => x, reduxMiddleware: () => next => action => next(action), watchAsyncStorage: () => {} };
 } else {
 
 // ─── Config ───────────────────────────────────────────────────────────────────