codeplay-common 4.6.0 → 4.6.2

package/README.md

@@ -28,11 +28,15 @@ For example, publish `agents-1.1.zip` and add this entry to the server's
 "agents": "1.1"
 ```
 
-Donate to get full code including many common functions
-https://ko-fi.com/codeplay
-
-4.2.8
-  baseline profile code modifications
+Donate to get full code including many common functions
+https://ko-fi.com/codeplay
+
+Version 4.6.1
+  Added automatic IAP startup integration for Framework7 home pages.
+  Updated minimum shared versions to IAP 4.2 and AdMob nextgen 2.5.
+
+4.2.8
+  baseline profile code modifications
 
 Version 4.2.3
   Added build warning confirmation when android.ORIENTATION is not "auto" or android.RESIZEABLE_ACTIVITY is not true.

package/files/buildCodeplay/{codeplayBeforeBuild-6.2.js → codeplayBeforeBuild-6.3.js}

@@ -502,120 +502,107 @@ checkAppUniqueId();
 
 
 
-// ======================================================
-// 🚫 BLOCK STATIC IMPORT OF showSubscribePopup (ANY VERSION)
-// ======================================================
-
-const STATIC_SUBSCRIBE_REGEX = /import\s*{\s*showSubscribePopup\s*}\s*from\s*['"].*\/js\/Ads\/IAP-\d+(\.\d+)*\/IAP-check-And-LoadAd\.js['"]/;
-
-// ✅ Detect dynamic import (valid)
-const DYNAMIC_SUBSCRIBE_REGEX = /await\s+import\s*\(\s*['"].*\/js\/Ads\/IAP-\d+(\.\d+)*\/IAP-check-And-LoadAd\.js['"]\s*\)/;
-
-let subscribeImportError = false;
-
-function scanSubscribeImport(dir) {
-  const files = fs.readdirSync(dir);
-
-  for (const file of files) {
-    const fullPath = path.join(dir, file);
-    const stat = fs.statSync(fullPath);
-
-    if (stat.isDirectory()) {
-      scanSubscribeImport(fullPath);
-    } 
-    else if (file.endsWith(".js") || file.endsWith(".ts") || file.endsWith(".f7")) {
-
-      const content = fs.readFileSync(fullPath, "utf-8");
-      const lines = content.split("\n");
-
-      lines.forEach((line, index) => {
-
-        // ❌ STATIC import → ERROR
-        if (STATIC_SUBSCRIBE_REGEX.test(line)) {
-          console.error(`
-❌ Forbidden static import detected!
-
-File: ${fullPath}
-Line: ${index + 1}
-Code: ${line.trim()}
-
-🚫 DO NOT use static import for showSubscribePopup
-
-👉 Remove:
-import { showSubscribePopup } from './../js/Ads/IAP-x.x/IAP-check-And-LoadAd.js'
-
-
-✅ Use dynamic import (ANY version allowed):
-
-    let IAPModule = null;
-    const loadIAP = async () => {
-        if (!IAPModule) {
-          IAPModule = await import('./../js/Ads/IAP-x.x/IAP-check-And-LoadAd.js');
-          IAPModule.initIAP?.();
-        }
-
-        return IAPModule;
-    };
-  
-    $on('pageAfterIn', async () => {
-        await loadIAP();
-    });
-
-    const subscribeOrProLink = async () => {
-                
-        //This is only allowed if samsung have pro version
-        if(_storeid==2)
-          gotoBuyPro("com.html.codeplay.pro",noAppOpenShowUntilResume)    
-        else{
-            const module = await loadIAP();
-            module.showSubscribePopup();
-        }
-    };
-`);
-          subscribeImportError = true;
-        }
-
-        // ❌ Optional: detect wrong dynamic usage (no await)
-        if (
-          line.includes("import(") &&
-          line.includes("IAP-") &&
-          !line.includes("await")
-        ) {
-          console.warn(`
-⚠️ Warning: Dynamic import without await
-
-File: ${fullPath}
-Line: ${index + 1}
-Code: ${line.trim()}
-
-👉 Always use:
-const { showSubscribePopup } = await import(...)
-`);
-        }
-
-      });
-    }
-  }
-}
-
-
-// Run scan
-scanSubscribeImport(ROOT_DIR);
-
-// Stop build
-if (subscribeImportError) {
-  console.error("🚫 Build failed due to forbidden showSubscribePopup static import.");
-  process.exit(1);
-} else {
-  console.log("✅ showSubscribePopup import usage is valid.");
-}
-
-
-
-
-// ======================================================
-// 🚫 BLOCK STATIC IMPORT OF showSubscribePopup (ANY VERSION)  END
-// ======================================================
+// ======================================================
+// ENSURE IAP STARTS FROM THE HOME PAGE
+// ======================================================
+
+const getHomePagePath = () => {
+  const pagesDir = path.join(ROOT_DIR, "pages");
+  if (!fs.existsSync(pagesDir)) return null;
+
+  const exactHomePath = path.join(pagesDir, "home.f7");
+  if (fs.existsSync(exactHomePath)) return exactHomePath;
+
+  const pageFiles = fs.readdirSync(pagesDir)
+    .filter(fileName => fileName.endsWith(".f7"));
+
+  return pageFiles
+    .map(fileName => path.join(pagesDir, fileName))
+    .find(filePath => /data-name\s*=\s*['"]home['"]/.test(fs.readFileSync(filePath, "utf8"))) || null;
+};
+
+const getRelativeModuleImport = (sourceFile, targetFile) => {
+  let relativePath = path.relative(path.dirname(sourceFile), targetFile).replace(/\\/g, "/");
+  if (!relativePath.startsWith(".")) relativePath = `./${relativePath}`;
+  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;
+  if (!isAnyIapStoreEnabled(iapConfig)) {
+    console.log("ℹ️ IAP is disabled for every store. AdMob will use direct startup.");
+    return;
+  }
+
+  const latestIapDir = getLatestIapDir();
+  if (!latestIapDir) {
+    throw new Error("IAP is enabled but no IAP-x.x folder was found.");
+  }
+
+  const homePagePath = getHomePagePath();
+  if (!homePagePath) {
+    throw new Error("IAP is enabled but a Framework7 Home page could not be found in src/pages.");
+  }
+
+  const iapModulePath = path.join(latestIapDir, "IAP-check-And-LoadAd.js");
+  if (!fs.existsSync(iapModulePath)) {
+    throw new Error(`IAP startup module is missing: ${iapModulePath}`);
+  }
+
+  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);
+
+  if (content !== originalContent) {
+    fs.writeFileSync(homePagePath, content, "utf8");
+    console.log(`✅ Added direct IAP startup to ${path.relative(process.cwd(), homePagePath)}.`);
+  } else {
+    console.log(`ℹ️ Direct IAP startup already configured in ${path.relative(process.cwd(), homePagePath)}.`);
+  }
+};
+
+// ======================================================
+// ENSURE IAP STARTS FROM THE HOME PAGE END
+// ======================================================
 
 
 
@@ -4184,9 +4171,10 @@ async function main() {
   await syncAgentInstructions();
 
   await syncAdmobNextgenMigration();
-  syncSystemBarsSafeAreaMigration();
-  await checkPlugins();
-  syncRevenueCatIapSetup();
+  syncSystemBarsSafeAreaMigration();
+  await checkPlugins();
+  ensureIapStartupOnHomePage();
+  syncRevenueCatIapSetup();
   syncFirebaseAnalyticsSetup();
   checkAndupdateDropInViteConfig();
   checkAdmobConfigurationProperty();

package/files/buildCodeplay/{setSplashAnimation-1.2.js → setSplashAnimation-1.3.js}

@@ -133,7 +133,11 @@ import androidx.activity.EdgeToEdge;
         protected void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
 
-            EdgeToEdge.enable(this); 
+            // Android 15+ enforces edge-to-edge. Older Android and Fire OS
+            // should let the system keep the WebView clear of system bars.
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+                EdgeToEdge.enable(this);
+            }
 
             // Handle custom splash screen exit animation
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {

package/files/buildCodeplay/versions.json

@@ -3,7 +3,7 @@
 {"name":"backbutton","pattern":"backbutton-(\\d+\\.\\d+)\\.js$","minVersion":"2.1","baseDir":"js","mandatoryUpdate":true},
 {"name":"common-js","pattern":"common-(\\d+\\.\\d+)(?:-beta-(\\d+))?\\.js$","minVersion":"6.7","baseDir":"js","mandatoryUpdate":true},
 
-{"name":"admob-emi-nextgen","pattern":"Ads[\\\\/]admob-emi-nextgen-(\\d+\\.\\d+)\\.js$","minVersion":"1.0","baseDir":"js","mandatoryUpdate":true},
+{"name":"admob-emi-nextgen","pattern":"Ads[\\\\/]admob-emi-nextgen-(\\d+\\.\\d+)\\.js$","minVersion":"2.5","baseDir":"js","mandatoryUpdate":true},
 {"name":"video-player","pattern":"video-player-(\\d+\\.\\d+)\\.js$","minVersion":"1.6","baseDir":"js","mandatoryUpdate":true},
 {"name":"image-cropper","pattern":"image-cropper-(\\d+\\.\\d+)\\.js$","minVersion":"1.1","baseDir":"js","mandatoryUpdate":true},
 {"name":"beautify","pattern":"beautify-(\\d+\\.\\d+)\\.js$","minVersion":"1.1","baseDir":"js","mandatoryUpdate":true},
@@ -17,7 +17,7 @@
 {"name":"ffmpeg","pattern":"ffmpeg-(\\d+\\.\\d+)$","minVersion":"1.6","baseDir":"js","mandatoryUpdate":true,"isFolder":true},
 {"name":"theme","pattern":"theme-(\\d+\\.\\d+)$","minVersion":"3.5","baseDir":"theme","destDir":"theme","mandatoryUpdate":true,"isFolder":true},
 {"name":"certificatejs","pattern":"certificatejs-(\\d+\\.\\d+)$","minVersion":"1.9","baseDir":"certificate","destDir":"certificate","mandatoryUpdate":true,"isFolder":true},
-{"name":"IAP","pattern":"IAP-(\\d+\\.\\d+)$","minVersion":"3.6","baseDir":"js/Ads","mandatoryUpdate":true,"isFolder":true},
+{"name":"IAP","pattern":"IAP-(\\d+\\.\\d+)$","minVersion":"4.2","baseDir":"js/Ads","mandatoryUpdate":true,"isFolder":true},
 {"name":"common-less","pattern":"common-(\\d+\\.\\d+)\\.less$","minVersion":"1.8","baseDir":"assets/css","mandatoryUpdate":true},
 {"name":"localNotification_AppSettings","pattern":"localNotification_AppSettings-(\\d+\\.\\d+)\\.js$","minVersion":"1.0","baseDir":"js","mandatoryUpdate":true},
 {"name":"localNotification","pattern":"localNotification-(\\d+\\.\\d+)\\.js$","minVersion":"2.2","baseDir":"js","mandatoryUpdate":true},

package/files/finalrelease

@@ -703,7 +703,7 @@ function findGradleBlock(content, headerPattern) {
 const amazonWindowExtensionsDependency = 'implementation "androidx.window.extensions.core:core:1.0.0"';
 const amazonWindowExtensionsDependencyPattern = /^[ \t]*implementation\s+["']androidx\.window\.extensions\.core:core:[^"']+["'][ \t]*(?:\r?\n)?/gm;
 
-function setAmazonWindowExtensionsDependency(enabled) {
+function setAmazonWindowExtensionsDependency(enabled, { cleanup = false } = {}) {
     const currentGradleContent = readFileSync(gradleFilePath, 'utf8');
     let nextGradleContent = currentGradleContent.replace(amazonWindowExtensionsDependencyPattern, '');
 
@@ -728,7 +728,9 @@ function setAmazonWindowExtensionsDependency(enabled) {
 
     console.log(enabled
         ? '✅ Added Amazon Fire WebView compatibility dependency for Store ID 7.'
-        : 'ℹ️  Amazon Fire WebView compatibility dependency is not included for this build.');
+        : cleanup
+            ? 'ℹ️  Removed temporary Amazon Fire WebView compatibility dependency after build cleanup.'
+            : 'ℹ️  Amazon Fire WebView compatibility dependency is not included for this build.');
 }
 
 const versionCodeMatch = gradleContent.match(/versionCode\s+(\d+)/);
@@ -1002,11 +1004,15 @@ rl.question('Enter new versionCode (press enter to keep current): ', (newVersion
             } catch (error) {
                 console.error(`❌ Error during build for Store ID ${id}:`, error);
                 restoreFlowchartStoreApi();
-                setAmazonWindowExtensionsDependency(false);
+                setAmazonWindowExtensionsDependency(false, {
+                    cleanup: String(id) === '7' && amazon === true,
+                });
                 process.exit(1);
             } finally {
                 restoreFlowchartStoreApi();
-                setAmazonWindowExtensionsDependency(false);
+                setAmazonWindowExtensionsDependency(false, {
+                    cleanup: String(id) === '7' && amazon === true,
+                });
             }
         });
 

package/package.json

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