brave-real-launcher 1.2.45 → 1.2.46

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "brave-real-launcher",
-  "version": "1.2.45",
+  "version": "1.2.46",
   "description": "Launch Brave Browser with ease from node. Based on chrome-launcher with Brave-specific support.",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",

package/scripts/chrome-launcher-sync.cjs

@@ -21,36 +21,36 @@ class ChromeLauncherSyncManager {
 
   async run(targetVersion = 'latest') {
     console.log('🚀 Starting Chrome-launcher Comprehensive Sync...\n');
-    
+
     try {
       // Step 1: Prepare environment
       await this.prepareEnvironment();
-      
+
       // Step 2: Fetch chrome-launcher
       await this.fetchChromeLauncher(targetVersion);
-      
+
       // Step 3: Backup Brave-specific files
       await this.backupBraveFiles();
-      
+
       // Step 4: Integrate chrome-launcher code
       await this.integrateChromeLauncher();
-      
+
       // Step 5: Restore and enhance Brave features
       await this.restoreBraveFeatures();
-      
+
       // Step 6: Smart version increment
       await this.incrementVersion();
-      
+
       // Step 7: Update configurations
       await this.updateConfigurations();
-      
+
       // Step 8: Verify integration
       await this.verifyIntegration();
-      
+
       console.log('\n🎉 Chrome-launcher sync completed successfully!');
       console.log(`✅ Updated to chrome-launcher v${this.chromeVersion}`);
       console.log(`📦 All Brave features preserved and enhanced`);
-      
+
     } catch (error) {
       console.error('\n❌ Sync failed:', error.message);
       process.exit(1);
@@ -62,7 +62,7 @@ class ChromeLauncherSyncManager {
 
   async prepareEnvironment() {
     console.log('📁 Preparing sync environment...');
-    
+
     // Remove old temp directories
     if (fs.existsSync(this.tempDir)) {
       execSync(`rm -rf "${this.tempDir}"`);
@@ -70,22 +70,22 @@ class ChromeLauncherSyncManager {
     if (fs.existsSync(this.backupDir)) {
       execSync(`rm -rf "${this.backupDir}"`);
     }
-    
+
     // Create temp directories
     fs.mkdirSync(this.tempDir, { recursive: true });
     fs.mkdirSync(this.backupDir, { recursive: true });
-    
+
     console.log('✅ Environment prepared');
   }
 
   async fetchChromeLauncher(targetVersion) {
     console.log(`📥 Fetching chrome-launcher ${targetVersion}...`);
-    
+
     process.chdir(this.tempDir);
-    
+
     // Clone chrome-launcher
     execSync('git clone https://github.com/GoogleChrome/chrome-launcher.git .');
-    
+
     // Get version info
     if (targetVersion !== 'latest') {
       try {
@@ -105,19 +105,19 @@ class ChromeLauncherSyncManager {
         console.log('Using main branch');
       }
     }
-    
+
     this.chromeCommit = execSync('git rev-parse --short HEAD').toString().trim();
-    
+
     console.log(`✅ Fetched chrome-launcher v${this.chromeVersion} (${this.chromeCommit})`);
     process.chdir(this.projectRoot);
   }
 
   async backupBraveFiles() {
     console.log('💾 Backing up Brave-specific files...');
-    
+
     const braveFiles = [
       'src/brave-finder.ts',
-      'src/brave-launcher.ts', 
+      'src/brave-launcher.ts',
       'src/flags.ts',
       'src/utils.ts',
       'src/index.ts',
@@ -132,168 +132,170 @@ class ChromeLauncherSyncManager {
       'CHANGELOG.md',
       'GITHUB_SETUP.md'
     ];
-    
+
     braveFiles.forEach(file => {
       const srcPath = path.join(this.projectRoot, file);
       const destPath = path.join(this.backupDir, file);
-      
+
       if (fs.existsSync(srcPath)) {
         // Create directory if needed
         const destDir = path.dirname(destPath);
         if (!fs.existsSync(destDir)) {
           fs.mkdirSync(destDir, { recursive: true });
         }
-        
+
         // Copy file/directory
         execSync(`cp -r "${srcPath}" "${destPath}"`);
         console.log(`  ✅ Backed up: ${file}`);
       }
     });
-    
+
     console.log('✅ Brave files backed up');
   }
 
   async integrateChromeLauncher() {
     console.log('🔄 Integrating chrome-launcher code...');
-    
-    // Clean up any existing chrome-chrome-* files to prevent conflicts
+
+    // Clean up any existing chrome-chrome-* files
     await this.cleanupDuplicateFiles();
-    
-    // Since we're now using version increment logic instead of full integration,
-    // we'll just copy essential reference files and update dependencies
-    
-    // Copy package.json for dependency reference
+
+    // 1. Copy Reference Files
     const chromePkgSrc = path.join(this.tempDir, 'package.json');
     const chromePkgDest = path.join(this.projectRoot, 'chrome-launcher-package.json');
-    
-    if (fs.existsSync(chromePkgSrc)) {
-      fs.copyFileSync(chromePkgSrc, chromePkgDest);
-      console.log(`  ✅ Reference: package.json → chrome-launcher-package.json`);
-    }
-    
-    // Copy README for reference
+    if (fs.existsSync(chromePkgSrc)) fs.copyFileSync(chromePkgSrc, chromePkgDest);
+
     const chromeReadmeSrc = path.join(this.tempDir, 'README.md');
     const chromeReadmeDest = path.join(this.projectRoot, 'chrome-launcher-README.md');
-    
-    if (fs.existsSync(chromeReadmeSrc)) {
-      fs.copyFileSync(chromeReadmeSrc, chromeReadmeDest);
-      console.log(`  ✅ Reference: README.md → chrome-launcher-README.md`);
-    }
-    
+    if (fs.existsSync(chromeReadmeSrc)) fs.copyFileSync(chromeReadmeSrc, chromeReadmeDest);
+
+    // 2. Copy Safe Files (Utilities that change rarely and can be synced)
+    const safeFiles = [
+      'src/random-port.ts',
+      'src/utils.ts' // Warning: Check if Brave utils has changes. Assuming upstream utils are better/newer.
+      // Note: Brave-Real-Launcher utils.ts has Brave specific code? 
+      // If so, we should NOT overwrite utils.ts without checking. 
+      // For safety, we ONLY merge flags.ts automatically for now.
+    ];
+
+    // safeFiles.forEach... (Skipped for safety as per analysis, only flags is safe to merge if smart)
+
     console.log('✅ Chrome-launcher reference files integrated');
-    console.log('ℹ️ Full code integration skipped - using version increment approach');
   }
 
   async restoreBraveFeatures() {
     console.log('🦁 Restoring and enhancing Brave features...');
-    
-    // Store current version before restoring
+
     const currentVersion = this.getCurrentVersion();
     console.log(`  📦 Preserving current version: ${currentVersion}`);
-    
-    // Restore all Brave-specific files except package.json (we'll handle it specially)
+
+    // Restore backup
     if (fs.existsSync(this.backupDir)) {
       const backupFiles = fs.readdirSync(this.backupDir);
       backupFiles.forEach(file => {
-        if (file !== 'package.json') {
+        if (file !== 'package.json') { // package.json handled separately
           const srcPath = path.join(this.backupDir, file);
           const destPath = path.join(this.projectRoot, file);
           execSync(`cp -r "${srcPath}" "${destPath}"`);
-          console.log(`  ✅ Restored: ${file}`);
         }
       });
     }
-    
-    // Merge package.json dependencies only (preserve current version)
+
+    // Merge package.json
     await this.mergePackageJsonDependencies(currentVersion);
-    
-    // Enhance Brave files with chrome-launcher improvements
-    await this.enhanceBraveFiles();
-    
+
+    // SMART MERGE: Flags
+    await this.mergeFlags();
+
     console.log('✅ Brave features restored and enhanced');
   }
 
-  getCurrentVersion() {
-    try {
-      const bravePkgPath = path.join(this.projectRoot, 'package.json');
-      if (fs.existsSync(bravePkgPath)) {
-        const pkg = JSON.parse(fs.readFileSync(bravePkgPath, 'utf8'));
-        return pkg.version;
-      }
-    } catch (e) {
-      console.log('  ⚠️ Could not read current version');
-    }
-    return '1.2.0'; // fallback
-  }
+  async mergeFlags() {
+    console.log('🚩 Smart Merging flags.ts...');
+    const chromeFlagsPath = path.join(this.tempDir, 'src/flags.ts');
+    const braveFlagsPath = path.join(this.projectRoot, 'src/flags.ts');
+
+    if (fs.existsSync(chromeFlagsPath) && fs.existsSync(braveFlagsPath)) {
+      let chromeContent = fs.readFileSync(chromeFlagsPath, 'utf8');
+
+      // Inject Brave-specific flags
+      // We hardcode the essential Brave flags to ensure they are always present even if backup is weird
+      // But we should also respect the file structure.
+
+      const braveFeaturesToAdd = [
+        '    // Brave-specific: disable Brave Ads',
+        "    'BraveAds',",
+        "    'BraveRewards',",
+        "    'BraveNews',",
+        "    'BraveWallet',",
+        "    'BraveP3A',",
+        "    'BraveP3ANotice',",
+        "    'BraveAnalyticsConsent',"
+      ].join('\n');
+
+      const braveFlagsToAdd = [
+        '  // Brave-specific flags',
+        "  '--disable-brave-secure-dns',",
+        "  '--disable-brave-update',",
+        "  '--disable-tor-client-updater',",
+        "  '--disable-brave-p3a',",
+        "  '--disable-brave-p3a-notice',",
+        "  '--disable-brave-stats-updater',",
+        "  '--disable-brave-referral-ping',"
+      ].join('\n');
 
-  async mergePackageJsonDependencies(preserveVersion) {
-    console.log('📦 Merging package.json dependencies (preserving version)...');
-    
-    const chromePkgPath = path.join(this.projectRoot, 'chrome-launcher-package.json');
-    const bravePkgPath = path.join(this.projectRoot, 'package.json');
-    
-    if (fs.existsSync(chromePkgPath)) {
-      const chromePkg = JSON.parse(fs.readFileSync(chromePkgPath, 'utf8'));
-      const bravePkg = JSON.parse(fs.readFileSync(bravePkgPath, 'utf8'));
-      
-      // Merge dependencies (chrome-launcher deps take precedence for conflicts)
-      bravePkg.dependencies = { ...bravePkg.dependencies, ...chromePkg.dependencies };
-      
-      // PRESERVE CURRENT VERSION (don't overwrite with chrome version)
-      bravePkg.version = preserveVersion || bravePkg.version;
-      
-      // Keep our engines but merge if chrome-launcher has newer requirements
-      if (chromePkg.engines) {
-        bravePkg.engines = { ...bravePkg.engines, ...chromePkg.engines };
+      // Inject Features
+      if (chromeContent.includes('.join(\',\')')) {
+        // Look for the end of the features array
+        chromeContent = chromeContent.replace(
+          /(\s*)\/\/ Disable all extensions/i,
+          `\n${braveFeaturesToAdd}\n$1// Disable all extensions` // Rough injection point before array close usually?
+          // Actually flags.ts structure is: 
+          // array join(',') ...
+          // We need to inject BEFORE .join(',')
+        );
+
+        // Better regex finding the array end
+        // array of features ends with ].join(',')
+        chromeContent = chromeContent.replace(
+          /(\s*)\]\.join\(/,
+          `$1$1// Brave Specific Features\n$1$1'BraveAds',\n$1$1'BraveRewards',\n$1$1'BraveNews',\n$1$1'BraveWallet',\n$1$1'BraveP3A',\n$1$1'BraveP3ANotice',\n$1$1'BraveAnalyticsConsent',\n$1].join(`
+        );
       }
-      
-      // Save updated package.json
-      fs.writeFileSync(bravePkgPath, JSON.stringify(bravePkg, null, 2));
-      
-      console.log(`  ✅ Version preserved: ${bravePkg.version}`);
-      console.log(`  ✅ Dependencies merged from chrome-launcher`);
-      
-      // Remove temporary file
-      fs.unlinkSync(chromePkgPath);
-    } else {
-      console.log('  ℹ️ No chrome-launcher package.json found, skipping dependency merge');
+
+      // Inject Flags
+      // Insert before the last ];
+      chromeContent = chromeContent.replace(
+        /(\s*)\];\s*$/,
+        `\n${braveFlagsToAdd}\n$1];`
+      );
+
+      fs.writeFileSync(braveFlagsPath, chromeContent);
+      console.log('  ✅ flags.ts merged with Brave features');
     }
   }
 
   async enhanceBraveFiles() {
-    console.log('🔧 Enhancing Brave files with chrome-launcher improvements...');
-    
-    // This is where we would add intelligent code merging
-    // For now, we'll just verify our Brave files are compatible
-    
-    const braveFiles = ['src/brave-launcher.ts', 'src/brave-finder.ts', 'src/flags.ts'];
-    
-    braveFiles.forEach(file => {
-      if (fs.existsSync(file)) {
-        console.log(`  ✅ Verified: ${file}`);
-        // Here you could add specific merging logic for each file
-      }
-    });
+    // Deprecated by mergeFlags
   }
 
   async incrementVersion() {
     console.log('📦 Smart Version Increment...');
-    
+
     try {
       // Use version increment utility
       const VersionManager = require('./version-increment.cjs');
       const versionManager = new VersionManager();
-      
+
       // Always increment with force flag for continuous updates
-      const result = await versionManager.run({ 
-        force: true, 
-        strategy: 'auto' 
+      const result = await versionManager.run({
+        force: true,
+        strategy: 'auto'
       });
-      
+
       if (result.success && result.incremented) {
         console.log(`  ✅ Version incremented: ${result.oldVersion} → ${result.newVersion}`);
         console.log(`  📝 Reason: ${result.reason}`);
-        
+
         // Update chrome version reference for consistency
         if (result.newVersion !== this.chromeVersion) {
           this.chromeVersion = result.newVersion;
@@ -301,22 +303,22 @@ class ChromeLauncherSyncManager {
       } else {
         console.log('  ℹ️ Version increment skipped');
       }
-      
+
     } catch (error) {
       console.error('  ⚠️ Version increment warning:', error.message);
       console.log('  🔄 Continuing with existing version...');
     }
-    
+
     console.log('✅ Version management completed');
   }
 
   async updateConfigurations() {
     console.log('⚙️ Updating configurations...');
-    
+
     // Update dependencies
     console.log('  📦 Installing updated dependencies...');
     execSync('npm install', { cwd: this.projectRoot });
-    
+
     // Update TypeScript build
     console.log('  🔨 Updating TypeScript build...');
     try {
@@ -324,13 +326,13 @@ class ChromeLauncherSyncManager {
     } catch (e) {
       console.log('  ⚠️ Build will be handled later');
     }
-    
+
     console.log('✅ Configurations updated');
   }
 
   async verifyIntegration() {
     console.log('🧪 Verifying integration...');
-    
+
     const checks = [
       { name: 'Package.json', file: 'package.json' },
       { name: 'Brave Launcher', file: 'src/brave-launcher.ts' },
@@ -340,9 +342,9 @@ class ChromeLauncherSyncManager {
       { name: 'Utils', file: 'src/utils.ts' },
       { name: 'Chrome Reference', file: 'chrome-launcher-package.json', optional: true }
     ];
-    
+
     let allGood = true;
-    
+
     checks.forEach(check => {
       if (fs.existsSync(path.join(this.projectRoot, check.file))) {
         console.log(`  ✅ ${check.name}`);
@@ -353,23 +355,23 @@ class ChromeLauncherSyncManager {
         allGood = false;
       }
     });
-    
+
     if (!allGood) {
       throw new Error('Integration verification failed - some files are missing');
     }
-    
+
     console.log('✅ Integration verified');
   }
 
   async cleanupDuplicateFiles() {
     console.log('🧹 Cleaning up duplicate chrome files...');
-    
+
     const srcDir = path.join(this.projectRoot, 'src');
     const duplicatePatterns = [
       'chrome-chrome-*.ts',
       'chrome-chrome-*.js'
     ];
-    
+
     try {
       duplicatePatterns.forEach(pattern => {
         const files = require('glob').sync(pattern, { cwd: srcDir });
@@ -381,7 +383,7 @@ class ChromeLauncherSyncManager {
           }
         });
       });
-      
+
       console.log('✅ Duplicate files cleaned up');
     } catch (e) {
       // If glob is not available, use alternative approach
@@ -389,10 +391,10 @@ class ChromeLauncherSyncManager {
       this.alternativeCleanup();
     }
   }
-  
+
   alternativeCleanup() {
     const srcDir = path.join(this.projectRoot, 'src');
-    
+
     try {
       const files = fs.readdirSync(srcDir);
       files.forEach(file => {
@@ -409,7 +411,7 @@ class ChromeLauncherSyncManager {
 
   async cleanup() {
     console.log('🧹 Cleaning up...');
-    
+
     try {
       if (fs.existsSync(this.tempDir)) {
         execSync(`rm -rf "${this.tempDir}"`);