codeplay-common 1.2.7 → 1.2.8

package/files/{finalrelease14 → finalrelease15}

@@ -19,7 +19,7 @@ let admobConfig;
 try {
     admobConfig = JSON.parse(fs.readFileSync(admobConfigPath, 'utf8'));
 } catch (err) {
-    console.error("Failed to read admob-ad-configuration.json", err);
+    console.error("❌ Failed to read admob-ad-configuration.json", err);
     process.exit(1);
 }
 
@@ -38,7 +38,7 @@ const checkCommonFileStoreId=()=>{
     }
     
     if (!viteConfigPath) {
-        console.error('Error: No vite.config.mjs or vite.config.js file found.');
+        console.error('❌ Error: No vite.config.mjs or vite.config.js file found.');
         process.exit(1);
     }
     
@@ -51,7 +51,7 @@ const checkCommonFileStoreId=()=>{
             const match = viteConfigContent.match(aliasPattern);
             
             if (!match) {
-                console.error(`Error: @common alias not found in ${viteConfigPath}`);
+                console.error(`❌ Error: @common alias not found in ${viteConfigPath}`);
                 process.exit(1);
             }
             
@@ -60,7 +60,7 @@ const checkCommonFileStoreId=()=>{
             
             // Read the common file content
             if (!fs.existsSync(resolvedCommonPath)) {
-                console.error(`Error: Resolved common file does not exist: ${resolvedCommonPath}`);
+                console.error(`❌ Error: Resolved common file does not exist: ${resolvedCommonPath}`);
                 process.exit(1);
             }
             
@@ -69,13 +69,13 @@ const checkCommonFileStoreId=()=>{
             // Check for the _storeid export line
             const storeIdPattern = /export\s+let\s+_storeid\s*=\s*import\.meta\.env\.VITE_STORE_ID\s*\|\|\s*1\s*;/;
             if (!storeIdPattern.test(commonFileContent)) {
-                console.error(`Error: _storeid value is wrong in ${commonFilePath}`);
+                console.error(`❌ Error: _storeid value is wrong in ${commonFilePath}`);
                 process.exit(1);
             }
     
             console.log(commonFilePath,'Success - No problem found');
         } catch (error) {
-            console.error('Error:', error);
+            console.error('❌ Error:', error);
             process.exit(1);
         }
 
@@ -84,13 +84,64 @@ const checkCommonFileStoreId=()=>{
 const checkIsTestingInAdmob=()=>{
     
     if (admobConfig.config && admobConfig.config.isTesting === true) {
-        console.error(`Problem found while generating the AAB file. Please change "isTesting: true" to "isTesting: false" in the "admob-ad-configuration.json" file.`);
+        console.error(`❌ Problem found while generating the AAB file. Please change "isTesting: true" to "isTesting: false" in the "admob-ad-configuration.json" file.`);
         process.exit(1); // Exit with an error code to halt the process
     } else {
-        console.log('No problem found. "isTesting" is either already false or not defined.');
+        console.log('✅ No problem found. "isTesting" is either already false or not defined.');
     }
 }
 
+const checkIsAdsDisableByReturnStatement=()=>{
+    
+    
+    const adsFolder = path.join('src', 'js', 'Ads');
+    const filePattern = /^admob-emi-(\d+\.)+\d+\.js$/;
+    
+    // Step 1: Find the admob file
+    const files = fs.readdirSync(adsFolder);
+    const admobFile = files.find(f => filePattern.test(f));
+    
+    if (!admobFile) {
+      console.log('❌ No Admob file found.');
+      process.exit(1);
+    }
+    
+    const filePath = path.join(adsFolder, admobFile);
+    const content = fs.readFileSync(filePath, 'utf-8');
+    
+    // Step 2: Extract the adsOnDeviceReady function body
+    const functionRegex = /async\s+function\s+adsOnDeviceReady\s*\([^)]*\)\s*{([\s\S]*?)^}/m;
+    const match = content.match(functionRegex);
+    
+    if (!match) {
+      console.log(`❌ Function 'adsOnDeviceReady' not found in file: ${admobFile}`);
+      process.exit(1);
+    }
+    
+    const body = match[1];
+    const lines = body.split('\n').map(line => line.trim());
+    
+    // Step 3: Skip blank lines and comments, get the first real code line
+    let firstCodeLine = '';
+    for (const line of lines) {
+      if (line === '' || line.startsWith('//')) continue;
+      firstCodeLine = line;
+      break;
+    }
+    
+    // Step 4: Block if it's any of the unwanted returns
+    const badReturnPattern = /^return\s*(true|false)?\s*;?$/;
+    
+    if (badReturnPattern.test(firstCodeLine)) {
+      console.log(`❌ BLOCKED in file '${admobFile}': First active line in 'adsOnDeviceReady' is '${firstCodeLine}'`);
+      process.exit(2);
+    } else {
+      console.log(`✅ Safe: No early return (true/false) found in 'adsOnDeviceReady' of file '${admobFile}'.`);
+    }
+}
+
+
+
 const addPermission_AD_ID=()=>{
 
     const admobPluginXmlPath = path.join('node_modules', 'emi-indo-cordova-plugin-admob', 'plugin.xml');
@@ -121,21 +172,22 @@ const addPermission_AD_ID=()=>{
     
                 // Write the updated manifest content back to AndroidManifest.xml
                 fs.writeFileSync(androidManifestPath, manifestContent, 'utf8');
-                console.log("ad_id permission added successfully.");
+                console.log("✅ ad_id permission added successfully.");
             } else {
-                console.log("ad_id permission already exists in AndroidManifest.xml.");
+                console.log("ℹ️  ad_id permission already exists in AndroidManifest.xml.");
             }
         } else {
-            console.error("AndroidManifest.xml not found at the specified path.");
+            console.error("❌ AndroidManifest.xml not found at the specified path.");
         }
     } else {
-        console.log("\x1b[33m%s\x1b[0m", "No admob found, so permission.AD_ID is not added");
+        console.log("\x1b[33m%s\x1b[0m", "⚠️ No admob found, so permission.AD_ID is not added");
     }
 }
 
 
 checkCommonFileStoreId();
 checkIsTestingInAdmob();
+checkIsAdsDisableByReturnStatement()
 
 
 let isAdmobFound = true;
@@ -144,7 +196,7 @@ addPermission_AD_ID()
 
 
 const { playstore, samsung, amazon } = admobConfig.IAP;
-console.log(`IAP Configurations - PlayStore: ${playstore}, Samsung: ${samsung}, Amazon: ${amazon}`);
+console.log(`ℹ️  IAP Configurations - PlayStore: ${playstore}, Samsung: ${samsung}, Amazon: ${amazon}`);
 
 
 
@@ -165,7 +217,7 @@ if (fs.existsSync(aabDirectory)) {
     files.forEach(file => {
         const filePath = path.join(aabDirectory, file);
         fs.unlinkSync(filePath);
-        console.log(`Deleted existing AAB file: ${file}`);
+        console.log(`ℹ️  Deleted existing AAB file: ${file}`);
     });
 }
 
@@ -214,8 +266,10 @@ rl.question('Enter new versionCode (press enter to keep current): ', (newVersion
         const finalVersionName = newVersionName || versionName; // Use existing if no input
 
         // Log the final version details
-        console.log(`Final versionCode: ${finalVersionCode}`);
-        console.log(`Final versionName: ${finalVersionName}`);
+        console.log(`📦 Final versionCode: ${finalVersionCode}`);
+        console.log(`📝 Final versionName: ${finalVersionName}`);
+
+
 
         // Update build.gradle with the new version details
         let updatedGradleContent = gradleContent
@@ -228,15 +282,43 @@ rl.question('Enter new versionCode (press enter to keep current): ', (newVersion
             // Add resConfigs "en" below versionName
             updatedGradleContent = updatedGradleContent.replace(/versionName\s+"[^"]+"/, `versionName "${finalVersionName}"\n${resConfigsLine}`);
         } else {
-            console.log('resConfigs "en" already exists in build.gradle.');
+            console.log('ℹ️  resConfigs "en" already exists in build.gradle.');
+        }
+
+
+
+        
+
+
+        if (/minifyEnabled\s+false/.test(updatedGradleContent)) {
+            updatedGradleContent = updatedGradleContent.replace(/minifyEnabled\s+false/, 'minifyEnabled true');
+            console.log('Replaced minifyEnabled false with true.');
+        } else if (!/minifyEnabled\s+true/.test(updatedGradleContent)) {
+            // Only insert if minifyEnabled (true or false) is NOT present
+            if (/buildTypes\s*{[\s\S]*?release\s*{/.test(updatedGradleContent)) {
+                updatedGradleContent = updatedGradleContent.replace(
+                    /(buildTypes\s*{[\s\S]*?release\s*{)/,
+                    '$1\n            minifyEnabled true'
+                );
+                console.log('✅ Inserted minifyEnabled true into release block.');
+            } else {
+                console.log('⚠️ Warning: buildTypes > release block not found. minifyEnabled was not added.');
+            }
+        } else {
+            console.log('ℹ️  minifyEnabled true already present. No change needed.');
         }
 
+
+
+
+
+
         // Write the updated gradle content back to build.gradle
         fs.writeFileSync(gradleFilePath, updatedGradleContent, 'utf8');
-        console.log(`Updated build.gradle with versionCode: ${finalVersionCode}, versionName: ${finalVersionName}, and resConfigs "en"`);
+        console.log(`✅ Updated build.gradle with versionCode: ${finalVersionCode}, versionName: ${finalVersionName}, resConfigs "en" and "minifyEnabled true"`);
 
         storeIds.forEach((id) => {
-            console.log(`Building for Store ID ${id}`);
+            console.log(`ℹ️  Building for Store ID ${id}`);
 
             // Set the environment variable for store ID
             process.env.VITE_STORE_ID = id;
@@ -318,13 +400,13 @@ rl.question('Enter new versionCode (press enter to keep current): ', (newVersion
                 const oldFilePath = path.join(aabDirectory, "app-release-signed.aab");
                 if (fs.existsSync(oldFilePath)) {
                     fs.renameSync(oldFilePath, checkFullPath);
-                    console.log(`Renamed output AAB file to: ${newFileName}`);
+                    console.log(`✅ Renamed output AAB file to: ${newFileName}`);
                 } else {
-                    console.error("AAB file not found after build.");
+                    console.error("❌ AAB file not found after build.");
                 }
 
             } catch (error) {
-                console.error(`Error during build for Store ID ${id}:`, error);
+                console.error(`❌ Error during build for Store ID ${id}:`, error);
             }
         });
 
@@ -356,7 +438,7 @@ function managePackages(store) {
         const permissionRegex = new RegExp(`^\\s*<uses-permission\\s+android:name="${permission}"\\s*/?>\\s*[\r\n]?`, 'm');
         if (permissionRegex.test(manifestContent)) {
             manifestContent = manifestContent.replace(permissionRegex, '');
-            console.log(`Removed <uses-permission android:name="${permission}" /> from AndroidManifest.xml`);
+            console.log(`✅ Removed <uses-permission android:name="${permission}" /> from AndroidManifest.xml`);
         }
     });
     
@@ -387,14 +469,14 @@ function managePackages(store) {
         try {
             child_process.execSync(`npm uninstall cordova-plugin-samsungiap`, { stdio: 'inherit' });
             child_process.execSync(`npm uninstall @revenuecat/purchases-capacitor`, { stdio: 'inherit' });
-            console.log(`Both plugins uninstalled successfully.`);
+            console.log(`✅ Both plugins uninstalled successfully.`);
         } catch (err) {
-            console.error("Error uninstalling plugins:", err);
+            console.error("❌ Error uninstalling plugins:", err);
         }
         return;
     }
 
-    console.log(`Installing ${install} and uninstalling ${uninstall} for ${store}...`);
+    console.log(`⚠️  Installing ${install} and uninstalling ${uninstall} for ${store}...`);
     try {
         if (install) {
             child_process.execSync(`npm install ${install}`, { stdio: 'inherit' });
@@ -402,9 +484,9 @@ function managePackages(store) {
         if (uninstall) {
             child_process.execSync(`npm uninstall ${uninstall}`, { stdio: 'inherit' });
         }
-        console.log(`${install} installed and ${uninstall} uninstalled successfully.`);
+        console.log(`✅ ${install} installed and ${uninstall} uninstalled successfully.`);
     } catch (err) {
-        console.error(`Error managing packages for ${store}:`, err);
+        console.error(`❌ Error managing packages for ${store}:`, err);
     }
 }
 
@@ -413,7 +495,7 @@ function managePackages(store) {
 function updateAndroidManifest(store, addPermission) {
     try {
         if (!fs.existsSync(androidManifestPath)) {
-            console.error("AndroidManifest.xml file not found!");
+            console.error("❌ AndroidManifest.xml file not found!");
             return;
         }
 
@@ -437,18 +519,18 @@ function updateAndroidManifest(store, addPermission) {
                 closingTag,
                 `${formattedPermission}${closingTag}`
             );
-            console.log(`Added ${addPermission} before </manifest> tag.`);
+            console.log(`✅ Added ${addPermission} before </manifest> tag.`);
         } else {
-            console.warn(`</manifest> tag not found. Adding ${addPermission} at the end of the file.`);
+            console.warn(`⚠️ </manifest> tag not found. Adding ${addPermission} at the end of the file.`);
             manifestContent += `\n${formattedPermission}`;
         }
 
         // Normalize line endings back to `\r\n` and write the updated content
         manifestContent = manifestContent.replace(/\n/g, '\r\n');
         fs.writeFileSync(androidManifestPath, manifestContent, 'utf-8');
-        console.log(`AndroidManifest.xml updated successfully for ${store}`);
+        console.log(`✅ AndroidManifest.xml updated successfully for ${store}`);
     } catch (err) {
-        console.error(`Error updating AndroidManifest.xml for ${store}:`, err);
+        console.error(`❌ Error updating AndroidManifest.xml for ${store}:`, err);
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeplay-common",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "description": "Common build scripts and files",
   "scripts": {
 	"postinstall": "node scripts/sync-files.js",