codeplay-common 4.9.9 → 4.10.0

package/files/buildCodeplay/apk-store-builder.js

@@ -1,98 +1,98 @@
-const { spawn } = require("child_process");
-const path = require("path");
-const fs = require("fs");
-
-// Paths
-//const projectRoot = path.join(__dirname, "..");
-const projectRoot = process.cwd();
-const androidPath = path.join(projectRoot, "android");
-const capacitorConfigPath = path.join(projectRoot, "capacitor.config.json");
-
-// Read capacitor.config.json
-if (!fs.existsSync(capacitorConfigPath)) {
-  console.error("❌ capacitor.config.json not found!");
-  process.exit(1);
-}
-
-const config = JSON.parse(fs.readFileSync(capacitorConfigPath, "utf8"));
-
-const buildOptions = config.android?.buildOptions;
-
-if (!buildOptions) {
-  console.error("❌ android.buildOptions not found in capacitor.config.json");
-  process.exit(1);
-}
-
-// Resolve keystore path (relative → absolute)
-
-
-const storePassword = buildOptions.keystorePassword;
-const keyAlias = buildOptions.keystoreAlias;
-const keyPassword = buildOptions.keystoreAliasPassword;
-
-
-
-
-
-
-const rawKeystorePath = buildOptions.keystorePath;
-
-// First try normal resolve
-let keystorePath = path.resolve(projectRoot, rawKeystorePath);
-
-// If not found, try trimming one "../"
-if (!fs.existsSync(keystorePath)) {
-  console.log("⚠️ Keystore not found, attempting path correction...");
-
-  const trimmedPath = rawKeystorePath.replace(/^\.\.\//, ""); 
-  keystorePath = path.resolve(projectRoot, trimmedPath);
-}
-
-// Final validation
-if (!fs.existsSync(keystorePath)) {
-  console.error("❌ Keystore file not found even after correction:", keystorePath);
-  process.exit(1);
-}
-
-console.log("🔐 Using keystore:", keystorePath);
-
-
-
-
-
-
-
-
-
-
-// Gradle args
-const isWindows = process.platform === "win32";
-const command = isWindows ? "cmd.exe" : "sh";
-const args = [
-  ...(isWindows ? ["/c", "gradlew.bat"] : ["./gradlew"]),
-  "assembleRelease",
-  `-Pandroid.injected.signing.store.file=${keystorePath}`,
-  `-Pandroid.injected.signing.store.password=${storePassword}`,
-  `-Pandroid.injected.signing.key.alias=${keyAlias}`,
-  `-Pandroid.injected.signing.key.password=${keyPassword}`,
-];
-
-// Run Gradle
-const gradle = spawn(command, args, {
-  cwd: androidPath,
-  stdio: "inherit",
-});
-
-gradle.on("error", (error) => {
-  console.error("❌ Could not start Gradle:", error.message);
-  process.exit(1);
-});
-
-gradle.on("close", (code) => {
-  if (code === 0) {
-    console.log("\n✅ Signed APK Generated Successfully!");
-  } else {
-    console.log("\n❌ Build Failed with code:", code);
-    process.exit(code ?? 1);
-  }
+const { spawn } = require("child_process");
+const path = require("path");
+const fs = require("fs");
+
+// Paths
+//const projectRoot = path.join(__dirname, "..");
+const projectRoot = process.cwd();
+const androidPath = path.join(projectRoot, "android");
+const capacitorConfigPath = path.join(projectRoot, "capacitor.config.json");
+
+// Read capacitor.config.json
+if (!fs.existsSync(capacitorConfigPath)) {
+  console.error("❌ capacitor.config.json not found!");
+  process.exit(1);
+}
+
+const config = JSON.parse(fs.readFileSync(capacitorConfigPath, "utf8"));
+
+const buildOptions = config.android?.buildOptions;
+
+if (!buildOptions) {
+  console.error("❌ android.buildOptions not found in capacitor.config.json");
+  process.exit(1);
+}
+
+// Resolve keystore path (relative → absolute)
+
+
+const storePassword = buildOptions.keystorePassword;
+const keyAlias = buildOptions.keystoreAlias;
+const keyPassword = buildOptions.keystoreAliasPassword;
+
+
+
+
+
+
+const rawKeystorePath = buildOptions.keystorePath;
+
+// First try normal resolve
+let keystorePath = path.resolve(projectRoot, rawKeystorePath);
+
+// If not found, try trimming one "../"
+if (!fs.existsSync(keystorePath)) {
+  console.log("⚠️ Keystore not found, attempting path correction...");
+
+  const trimmedPath = rawKeystorePath.replace(/^\.\.\//, "");
+  keystorePath = path.resolve(projectRoot, trimmedPath);
+}
+
+// Final validation
+if (!fs.existsSync(keystorePath)) {
+  console.error("❌ Keystore file not found even after correction:", keystorePath);
+  process.exit(1);
+}
+
+console.log("🔐 Using keystore:", keystorePath);
+
+
+
+
+
+
+
+
+
+
+// Gradle args
+const isWindows = process.platform === "win32";
+const command = isWindows ? "cmd.exe" : "sh";
+const args = [
+  ...(isWindows ? ["/c", "gradlew.bat"] : ["./gradlew"]),
+  "assembleRelease",
+  `-Pandroid.injected.signing.store.file=${keystorePath}`,
+  `-Pandroid.injected.signing.store.password=${storePassword}`,
+  `-Pandroid.injected.signing.key.alias=${keyAlias}`,
+  `-Pandroid.injected.signing.key.password=${keyPassword}`,
+];
+
+// Run Gradle
+const gradle = spawn(command, args, {
+  cwd: androidPath,
+  stdio: "inherit",
+});
+
+gradle.on("error", (error) => {
+  console.error("❌ Could not start Gradle:", error.message);
+  process.exit(1);
+});
+
+gradle.on("close", (code) => {
+  if (code === 0) {
+    console.log("\n✅ Signed APK Generated Successfully!");
+  } else {
+    console.log("\n❌ Build Failed with code:", code);
+    process.exit(code ?? 1);
+  }
 });

package/files/buildCodeplay/{codeplayBeforeBuild-6.5.js → codeplayBeforeBuild.js}

@@ -1,11 +1,83 @@
-// Version 6.5: migrate AdMob files to ZIP-distributed folder packages.
-// Version 6.5: recreate failed WebViews, defer background recovery, and suppress foreground recovery toasts.
+// Version 6.7: deferred IAP startup, ownership-safe ads, and unified store preparation.
+// Version 6.7: migrate AdMob files to ZIP-distributed folder packages.
+// Version 6.7: recreate failed WebViews, defer background recovery, and suppress foreground recovery toasts.
 const fs = require('fs');
 const path = require('path');
 const plist = require('plist');
 
 
 
+// BEGIN IAP BUILD MIGRATION
+const updateBuildEntrypoints = (scripts) => require('./project-scripts.cjs').updateBuildScripts(scripts);
+
+const migrateIapStartup = (content, bootstrapImport) => {
+  let next = content;
+  const bootstrapPattern = /import\s*\{\s*initIAP\s*\}\s*from\s*['"][^'"]*\/IAP-bootstrap\.js['"]\s*;?/;
+  if (!bootstrapPattern.test(next)) {
+    next = next.replace(/import\s*\{([^}]*)\}\s*from\s*(['"])([^'"]*\/IAP-\d+(?:\.\d+)*\/IAP-check-And-LoadAd\.js)\2\s*;?/g,
+      (match, names, quote, source) => {
+        const imports = names.split(',').map(name => name.trim()).filter(Boolean);
+        if (!imports.includes('initIAP')) return match;
+        const remaining = imports.filter(name => name !== 'initIAP');
+        return remaining.length ? `import { ${remaining.join(', ')} } from ${quote}${source}${quote};` : '';
+      });
+    next = next.replace(/<script>\s*\r?\n/, match => `${match}import { initIAP } from '${bootstrapImport}';\n`);
+  }
+  if (!/\binitIAP\s*\(/.test(next)) {
+    const component = /(export\s+default\s*\([^)]*\)\s*=>\s*\{\s*\r?\n)/;
+    if (!component.test(next)) throw new Error('Unsupported Home component: cannot schedule IAP safely.');
+    next = next.replace(component, '$1  initIAP();\n');
+  }
+  return next;
+};
+// Identify existing Pro controls without replacing an application's Home layout.
+// App-specific controls can opt in with the codeplay-iap-pro class.
+const migrateHomeIapVisibility = (content, stateImport) => {
+  const template = content.match(/<template>[\s\S]*?<\/template>/);
+  if (!template) return content;
+  const stack = [];
+  const controls = new Map();
+  const tags = /<!--[\s\S]*?-->|<\/?[\w-]+\b(?:[^"'<>]|"[^"]*"|'[^']*')*>/g;
+  for (const match of template[0].matchAll(tags)) {
+    const tag = match[0];
+    if (tag.startsWith('<!--')) continue;
+    const name = tag.match(/^<\/?([\w-]+)/)[1].toLowerCase();
+    if (tag.startsWith('</')) {
+      const index = stack.map(item => item.name).lastIndexOf(name);
+      if (index >= 0) stack.length = index;
+      continue;
+    }
+    const classMatch = tag.match(/\bclass\s*=\s*(["'])([\s\S]*?)\1/);
+    const classes = classMatch?.[2] || '';
+    const node = { name, tag, index: template.index + match.index, classes };
+    const clickable = item => /(?:@click|\bdata-iap-pro)\s*=/.test(item.tag) || ['a', 'button'].includes(item.name) || /\b(?:link|codeplay-iap-pro)\b/.test(item.classes);
+    if (/\b(?:trPro|clsSubscribeBtn|codeplay-iap-pro)\b/.test(classes) || /@click\s*=\s*["']\$\{\s*subscribeOrProLink\s*\}/.test(tag)) {
+      const control = clickable(node) ? node : [...stack].reverse().find(clickable) || (/\bclsSubscribeBtn\b/.test(classes) ? node : null);
+      if (control) controls.set(control.index, control);
+    }
+    if (!/\/\s*>$/.test(tag) && !['area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'link', 'meta', 'param', 'source', 'track', 'wbr'].includes(name)) stack.push(node);
+  }
+  if (!controls.size) return content;
+  const gate = stateImport ? "${isIAPEnabledForCurrentStore() ? '' : 'display-none'}" : "${false ? '' : 'display-none'}";
+  let next = content;
+  for (const control of [...controls.values()].sort((a, b) => b.index - a.index)) {
+    const classes = control.classes
+      .replace(/\$\{(?:isIAPEnabledForCurrentStore\(\)|false)\s*\?\s*''\s*:\s*'display-none'\s*\}/g, '')
+      .split(/\s+/).filter(name => name && !/^hideFor(?:Mi|Vivo|Huawei|Oppo|Amazon|Samsung|Playstore|PlayStore|Ios|iOS)$/.test(name) && name !== 'codeplay-iap-pro');
+    const value = `${classes.join(' ')} codeplay-iap-pro ${gate}`.trim();
+    const tag = /\bclass\s*=/.test(control.tag)
+      ? control.tag.replace(/\bclass\s*=\s*(["'])([\s\S]*?)\1/, () => `class="${value}"`)
+      : control.tag.replace(/^<[\w-]+/, match => `${match} class="${value}"`);
+    next = next.slice(0, control.index) + tag + next.slice(control.index + control.tag.length);
+  }
+  if (stateImport && !/import\s*\{[^}]*\bisIAPEnabledForCurrentStore\b[^}]*\}\s*from\s*['"][^'"]*\/IAP-state\.js['"]/.test(next)) {
+    if (!next.includes('<script>')) throw new Error('Cannot migrate Pro visibility: Home has no script block.');
+    next = next.replace(/<script>(?:[ \t]*\r?\n)?/, match => `${match}import { isIAPEnabledForCurrentStore } from '${stateImport}';\n`);
+  }
+  return next;
+};
+// END IAP BUILD MIGRATION
+
 const { execSync } = require("child_process");
 
 
@@ -95,10 +167,10 @@ const getLatestVersionedFileName = (dir, pattern) => {
 /* const requiredPlugins = [
 
   { pattern: /backbutton-(\d+\.\d+)\.js$/, minVersion: '2.0', required: true, baseDir: 'js',mandatoryUpdate: true},
-  
+
 
   { pattern: /common-(\d+\.\d+)(?:-beta-(\d+))?\.js$/, minVersion: '6.0', required: true, baseDir: 'js',mandatoryUpdate: true },
-  
+
   { pattern: /localization_settings-(\d+\.\d+)\.js$/, minVersion: '1.1', required: true, baseDir: 'js',mandatoryUpdate: false },
   { pattern: /localization-(\d+\.\d+)\.js$/, minVersion: '1.5', required: true, baseDir: 'js',mandatoryUpdate: true },
   { pattern: /localNotification-(\d+\.\d+)\.js$/, minVersion: '2.2', required: true, baseDir: 'js',mandatoryUpdate: false },
@@ -110,8 +182,8 @@ const getLatestVersionedFileName = (dir, pattern) => {
   { pattern: /video-player-(\d+\.\d+)\.js$/, minVersion: '1.5', required: true, baseDir: 'js',mandatoryUpdate: false },
   { pattern: /image-cropper-(\d+\.\d+)\.js$/, minVersion: '1.1', required: true, baseDir: 'js',mandatoryUpdate: false },
   { pattern: /common-(\d+\.\d+)\.less$/, minVersion: '1.6', required: true, baseDir: 'assets/css',mandatoryUpdate: false },
-  
-  
+
+
   // New folders
   { pattern: /IAP-(\d+\.\d+)$/, minVersion: '2.8', isFolder: true , required: true, baseDir: 'js/Ads',mandatoryUpdate: true },
   { pattern: /editor-(\d+\.\d+)$/, minVersion: '1.9', isFolder: true, required: true, baseDir: 'js',mandatoryUpdate: true },
@@ -120,11 +192,11 @@ const getLatestVersionedFileName = (dir, pattern) => {
 
 
   { pattern: /certificatejs-(\d+\.\d+)$/, minVersion: '1.6', isFolder: true , required: true, baseDir: 'certificate',mandatoryUpdate: true }
-  
+
 ]; */
 
 
-const ROOT_DIR = path.join(__dirname, "..", "src");
+const ROOT_DIR = path.join(process.cwd(), "src");
 
 function requireOrInstall(packageName) {
   try {
@@ -230,6 +302,7 @@ function loadRequiredPlugins() {
     !/^admob-(?:emi-)?nextgen$/i.test(String(p.name || '')) && !/^onesignal(?:-|$)/i.test(String(p.name || '')) && !/onesignal/i.test(String(p.pattern || ''))
   ).map(p => ({
     ...p,
+    minVersion: p.name === 'IAP' && compareVersionStrings(p.minVersion, '4.6') < 0 ? '4.6' : p.minVersion,
     pattern: new RegExp(p.pattern)
   }));
 
@@ -289,6 +362,12 @@ function getLatestVersion(packageName) {
 
 function checkPackageVersion() {
   const packageName = 'codeplay-common';
+  const appPackage = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+  const declaredPackage = appPackage.dependencies?.[packageName] || appPackage.devDependencies?.[packageName] || '';
+  if (/^(?:file:|link:|workspace:)/.test(declaredPackage)) {
+    console.log('Using local codeplay-common source; skipping registry replacement.');
+    return;
+  }
   const installedVersion = getInstalledVersion(packageName);
   const latestVersion = getLatestVersion(packageName);
 
@@ -298,9 +377,9 @@ function checkPackageVersion() {
     return;
   }
 
-  if (installedVersion !== latestVersion) {
+  if (compareVersionStrings(installedVersion, latestVersion) < 0) {
     console.log(`${packageName} is outdated (installed: ${installedVersion}, latest: ${latestVersion}). Updating now...`);
-    
+
     try {
       execSync(`npm uninstall ${packageName}`, { stdio: 'inherit' });
       execSync(`npm install ${packageName}`, { stdio: 'inherit' });
@@ -424,7 +503,7 @@ const checkAppUniqueId=()=>{
 
   if (!orientation) {
     logErrorMessage+='❌ Missing android.ORIENTATION option in capacitor.config.json.\n';
-  } 
+  }
 
   else if(orientation!="portrait" && orientation!="landscape" && orientation!="auto")
   {
@@ -555,34 +634,19 @@ const getRelativeModuleImport = (sourceFile, targetFile) => {
   return relativePath;
 };
 
-const addInitIapToExistingImport = (content) => {
-  const iapImportRegex = /import\s*\{([^}]*)\}\s*from\s*(['"])([^'"]*\/IAP-\d+(?:\.\d+)*\/IAP-check-And-LoadAd\.js)\2\s*;?/;
-  const match = content.match(iapImportRegex);
-  if (!match || /\binitIAP\b/.test(match[1])) return content;
-
-  const importNames = match[1].trim();
-  const nextImportNames = importNames ? `initIAP, ${importNames}` : "initIAP";
-  return content.replace(iapImportRegex, `import { ${nextImportNames} } from ${match[2]}${match[3]}${match[2]};`);
-};
-
-const addInitIapCall = (content) => {
-  if (/\binitIAP\s*\(/.test(content)) return content;
-
-  const pageInitRegex = /(\$on\(\s*(['"])pageInit\2\s*,\s*(?:async\s*)?\(\)\s*=>\s*\{\s*\r?\n)/;
-  if (pageInitRegex.test(content)) {
-    return content.replace(pageInitRegex, "$1    initIAP();\n");
-  }
-
-  const componentStartRegex = /(export\s+default\s*\([^)]*\)\s*=>\s*\{\s*\r?\n)/;
-  if (componentStartRegex.test(content)) {
-    return content.replace(componentStartRegex, "$1  initIAP();\n");
-  }
-
-  throw new Error("Unable to find a Framework7 component or pageInit lifecycle for IAP startup.");
-};
-
 const ensureIapStartupOnHomePage = () => {
   const iapConfig = getAdmobIapConfig()?.IAP;
+  const visibilityHome = getHomePagePath();
+  const visibilityIap = getLatestIapDir();
+  const statePath = visibilityIap && path.join(visibilityIap, 'IAP-state.js');
+  if (visibilityHome) {
+    const original = fs.readFileSync(visibilityHome, 'utf8');
+    const next = migrateHomeIapVisibility(original, statePath && fs.existsSync(statePath) ? getRelativeModuleImport(visibilityHome, statePath) : null);
+    if (next !== original) {
+      fs.writeFileSync(visibilityHome, next, 'utf8');
+      console.log(`✅ Updated shared Pro-button visibility in ${path.relative(process.cwd(), visibilityHome)}.`);
+    }
+  }
   if (!isAnyIapStoreEnabled(iapConfig)) {
     console.log("ℹ️ IAP is disabled for every store. AdMob will use direct startup.");
     return;
@@ -605,26 +669,15 @@ const ensureIapStartupOnHomePage = () => {
 
   let content = fs.readFileSync(homePagePath, "utf8");
   const originalContent = content;
-  const staticInitImportRegex = /import\s*\{[^}]*\binitIAP\b[^}]*\}\s*from\s*['"][^'"]*\/IAP-\d+(?:\.\d+)*\/IAP-check-And-LoadAd\.js['"]\s*;?/;
-
-  content = addInitIapToExistingImport(content);
-
-  if (!staticInitImportRegex.test(content)) {
-    const relativeImport = getRelativeModuleImport(homePagePath, iapModulePath);
-    const scriptStartRegex = /<script>\s*\r?\n/;
-    if (!scriptStartRegex.test(content)) {
-      throw new Error(`Unable to find the script block in ${homePagePath}`);
-    }
-    content = content.replace(scriptStartRegex, `$&import { initIAP } from '${relativeImport}';\n`);
-  }
-
-  content = addInitIapCall(content);
+  const bootstrapPath = path.join(latestIapDir, 'IAP-bootstrap.js');
+  if (!fs.existsSync(bootstrapPath)) throw new Error('IAP 4.6 or newer is required for deferred startup.');
+  content = migrateIapStartup(content, getRelativeModuleImport(homePagePath, bootstrapPath));
 
   if (content !== originalContent) {
     fs.writeFileSync(homePagePath, content, "utf8");
-    console.log(`✅ Added direct IAP startup to ${path.relative(process.cwd(), homePagePath)}.`);
+    console.log(`✅ Added background IAP startup to ${path.relative(process.cwd(), homePagePath)}.`);
   } else {
-    console.log(`ℹ️ Direct IAP startup already configured in ${path.relative(process.cwd(), homePagePath)}.`);
+    console.log(`ℹ️ Background IAP startup already configured in ${path.relative(process.cwd(), homePagePath)}.`);
   }
 };
 
@@ -647,7 +700,7 @@ const ensureIapStartupOnHomePage = () => {
 //const path = require("path");
 //const { execSync } = require("child_process");
 
-const jsDir = path.join(__dirname, "..", "src", "js");
+const jsDir = path.join(process.cwd(), "src", "js");
 
 // 🔍 Detect OLD structure
 const oldEditorDirs = fs.readdirSync(jsDir)
@@ -792,9 +845,9 @@ else {
 
 const saveToGalleryAndSaveFileCheck_iOS = async () => {
 
-  const SOURCE_ROOT = path.resolve(__dirname, '../src');
+  const SOURCE_ROOT = path.resolve(process.cwd(), 'src');
   const EXCLUDED_DIR = path.join(SOURCE_ROOT, 'js', 'Ads');
-  const ANDROID_MANIFEST_PATH = path.resolve(__dirname, '../android/app/src/main/AndroidManifest.xml');
+  const ANDROID_MANIFEST_PATH = path.resolve(process.cwd(), 'android/app/src/main/AndroidManifest.xml');
 
 
   // Skip comments and unrelated strings; match static/dynamic imports, re-exports and require.
@@ -816,7 +869,7 @@ You are using a direct version-based path like: editor/editor-x.x/editor.js
 
 👉 Please use the proper alias or updated import method.
 	Example: import { ... } from '@editor'
-	
+
 ⚠️ Do not use version-based paths in imports.
 👉 Please add this manually in vite.config.js:
 
@@ -838,7 +891,7 @@ const SKIP_FILES = [
 
 
 
-const STATUSBAR_FILE = path.resolve(__dirname, '../src/js/common-configuration.js');
+const STATUSBAR_FILE = path.resolve(process.cwd(), 'src/js/common-configuration.js');
 const STATUSBAR_REGEX = /^(?!\s*\/\/).*Capacitor\.Plugins\.StatusBar\.setStyle/m;
 
 
@@ -1151,7 +1204,7 @@ const routes = [
     },
   }]
 `);
-  
+
   badImports.forEach(({ line, number }) => {
     console.error(`${number}: ${line}`);
   });
@@ -1394,8 +1447,8 @@ if (updated) {
 
 // Build the path dynamically like you requested
 const gradlePath = path.join(
-  process.cwd(), 
-  'android', 
+  process.cwd(),
+  'android',
   'build.gradle'
 );
 
@@ -1614,11 +1667,11 @@ function validateAndroidBuildOptions() {
   const targetAppId=config.appId
 
   const buildOptions = config.android?.buildOptions;
-  
+
   if (!buildOptions) {
     console.log('❌ Missing android.buildOptions in capacitor.config.json.');
     process.exit(1);
-  } 
+  }
 
   const requiredProps = [
     'keystorePath',
@@ -1630,13 +1683,13 @@ function validateAndroidBuildOptions() {
   ];
 
   const missing = requiredProps.filter(prop => !buildOptions[prop]);
-  
+
   if (missing.length > 0) {
     console.log('❌ Missing properties android.buildOptions in capacitor.config.json.');
     process.exit(1);
   }
 
-  
+
   const keystorePath=buildOptions.keystorePath
   const keyFileName = path.basename(keystorePath);
 
@@ -1826,7 +1879,7 @@ try {
   _admobConfig = getAdMobConfig();
 
 
-  
+
 
 
   // Proceed only if ADMOB_ENABLED is true
@@ -2170,7 +2223,9 @@ async function syncAgentInstructions() {
 
   const zipName = `${AGENT_INSTRUCTIONS_ZIP_PREFIX}-${remoteVersion}.zip`;
   const url = `https://htmlcodeplay.com/code-play-plugin/${zipName}`;
-  const tempRoot = fs.mkdtempSync(path.join(require("os").tmpdir(), "codeplay-agents-"));
+  const agentTempRoot = path.join(process.cwd(), "agent-temp", "agent-instructions");
+  fs.mkdirSync(agentTempRoot, { recursive: true });
+  const tempRoot = fs.mkdtempSync(path.join(agentTempRoot, "codeplay-agents-"));
   const zipPath = path.join(tempRoot, zipName);
   const extractPath = path.join(tempRoot, "extracted");
 
@@ -2248,7 +2303,9 @@ if (baseName === "common") {
   if (ext === ".less") pluginKey = "common-less";
 }
 
-const latestVersion = versions[pluginKey];
+const advertisedVersion = versions[pluginKey];
+const latestVersion = baseName === 'IAP' && (!advertisedVersion || compareVersionStrings(advertisedVersion, pluginDef.minVersion) < 0)
+  ? pluginDef.minVersion : advertisedVersion;
 
   if (!latestVersion) {
     console.log(`❌ No version entry for ${baseName}`);
@@ -2269,12 +2326,17 @@ if (pluginDef.isFolder) {
 
   if (!(await urlExists(url))) return false;
 
-  fs.rmSync(oldPath, { recursive: true, force: true });
-
-  await downloadAndExtractZip(url, newPath);
-
+  const stagingRoot = path.join(process.cwd(), 'agent-temp', 'iap-package-sync');
+  fs.mkdirSync(stagingRoot, { recursive: true });
+  const staging = fs.mkdtempSync(path.join(stagingRoot, 'package-'));
+  await downloadAndExtractZip(url, staging);
+  if (baseName === 'IAP' && ['IAP-check-And-LoadAd.js', 'IAP-bootstrap.js', 'IAP-state.js', 'IAP-store.js'].some(name => !fs.existsSync(path.join(staging, name)))) throw new Error('Invalid IAP archive');
+  if (fs.existsSync(newPath)) throw new Error('Replacement folder already exists; existing sources preserved.');
+  fs.renameSync(staging, newPath);
+  sourceFileInventory = null;
   updateImports(pluginInfo.name, `${baseName}-${latestVersion}`);
 
+  fs.rmSync(oldPath, { recursive: true, force: true });
   // ✅ ADD THIS
   writeUpdateLine(`${pluginInfo.name} -> ${baseName}-${latestVersion}`);
 
@@ -2352,7 +2414,7 @@ existingFiles.forEach(file => {
     fs.unlinkSync(oldPath);
 
     console.log(`🗑 Removed old file → ${file}`);
-    //writeUpdateLine(`Removed old file: ${file}`);   
+    //writeUpdateLine(`Removed old file: ${file}`);
   }
 
 });
@@ -2415,7 +2477,7 @@ async function loadPluginVersions() {
     if (!plugin.name) return;
 
     if (versions[plugin.name]) {
-      plugin.minVersion = versions[plugin.name];
+      if (compareVersionStrings(versions[plugin.name], plugin.minVersion) > 0) plugin.minVersion = versions[plugin.name];
     }
 
   });
@@ -2518,7 +2580,7 @@ function checkPlugins() {
       } */
 
 
-        
+
 
 
 if (hasMandatoryUpdate) {
@@ -2625,14 +2687,14 @@ if (hasMandatoryUpdate) {
 
 
 
-const localizationBaseDir = path.join(__dirname, "..", "src", "js", "localization");
+const localizationBaseDir = path.join(process.cwd(), "src", "js", "localization");
 
 // ======================================================
 // 🌐 LOCALIZATION CHECK (FULLY DYNAMIC)
 // ======================================================
 
 
-const jsRootDir = path.join(__dirname, "..", "src", "js");
+const jsRootDir = path.join(process.cwd(), "src", "js");
 
 // 🔍 Detect OLD localization files in root js/
 const oldLocalizationFiles = fs.readdirSync(jsRootDir)
@@ -3713,6 +3775,7 @@ const ensureIapDesignInCapacitorConfig = (iapConfig) => {
 };
 
 const getCurrentStoreId = () => {
+  if (buildPlatform === 'ios') return 6;
   const envStoreId = Number(process.env.VITE_STORE_ID);
   if (Number.isInteger(envStoreId) && envStoreId > 0) return envStoreId;
 
@@ -3900,6 +3963,17 @@ const syncRevenueCatIapSetup = () => {
     console.log(`ℹ️ RevenueCat package is not required for store id ${storeId}.`);
   }
 
+  const samsungEnabled = storeId === 2 && iapConfig.samsung === true;
+  const samsungPackagePath = path.join(process.cwd(), 'node_modules', 'cordova-plugin-samsungiap', 'package.json');
+  const samsungVersion = fs.existsSync(samsungPackagePath) ? JSON.parse(fs.readFileSync(samsungPackagePath, 'utf8')).version : '0';
+  if (samsungEnabled && (!isPackageAvailable('cordova-plugin-samsungiap') || compareVersionStrings(samsungVersion, '2.0.0') < 0)) {
+    runNpmCommand('npm install cordova-plugin-samsungiap@^2.0.0');
+    packageChanged = true;
+  } else if (!samsungEnabled && isPackageAvailable('cordova-plugin-samsungiap')) {
+    runNpmCommand('npm uninstall cordova-plugin-samsungiap');
+    packageChanged = true;
+  }
+  ensureAndroidPermission('com.samsung.android.iap.permission.BILLING', samsungEnabled);
   ensureAndroidPermission("com.android.vending.BILLING", store?.usesGoogleBilling === true && revenueCatEnabledForCurrentStore);
 
   if (iapConfig.samsung === true && revenueCatEnabled) {
@@ -4169,8 +4243,8 @@ const validateAndRestoreSignDetails=()=>{
 
 
 const filePath = path.join(
-  __dirname,
-  "../node_modules/@capacitor/android/capacitor/src/main/java/com/getcapacitor/plugin/SystemBars.java"
+  process.cwd(),
+  "node_modules/@capacitor/android/capacitor/src/main/java/com/getcapacitor/plugin/SystemBars.java"
 );
 
 const SYSTEM_BARS_PATCH_MARKER = "CODEPLAY_KEYBOARD_INSET_FIX";
@@ -4388,17 +4462,23 @@ function syncAndroidCordovaResourceKeep() {
 }
 
 async function main() {
+  const buildPackage = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+  const buildScripts = updateBuildEntrypoints(buildPackage.scripts || {});
+  if (JSON.stringify(buildScripts) !== JSON.stringify(buildPackage.scripts)) {
+    buildPackage.scripts = buildScripts;
+    fs.writeFileSync(packageJsonPath, JSON.stringify(buildPackage, null, 2) + '\n');
+  }
   validateThemeFolderLocation();
   validateAndRestoreSignDetails();
   ensureMandatoryCapacitorPlugins();
 
   await loadPluginVersions();   // 🔥 NEW
   await syncAgentInstructions();
+  await checkPlugins();
 
    await syncAdmobNextgenMigration();
    syncCodeplaySystemBarsPackage();
    syncSystemBarsSafeAreaMigration();
-  await checkPlugins();
   ensureIapStartupOnHomePage();
   syncRevenueCatIapSetup();
   syncFirebaseAnalyticsSetup();