codeplay-common 4.1.0 → 4.1.3

package/README.md

@@ -12,7 +12,13 @@ Donate to get full code including many common functions
 https://ko-fi.com/codeplay
 
 
-Version 4.1.0
+Version 4.1.3
+"consentDebug": false automatically adds if not
+
+Version 4.1.2
+  Speedup
+
+Version 4.1.1
   Auto admob integration updated
 
 

package/files/buildCodeplay/codeplayBeforeBuild-6.2.js

@@ -14,9 +14,12 @@ const { readFileSync } = require("fs");
 const ENABLE_AUTO_UPDATE = true;
 const USE_LIVE_SERVER_VERSION = true;
 
-const configPath = path.join(process.cwd(), 'capacitor.config.json');
-const packageJsonPath = path.join(process.cwd(), 'package.json');
-const updateLogFile = path.join(process.cwd(), "", "plugin-update-log.txt");
+const configPath = path.join(process.cwd(), 'capacitor.config.json');
+const packageJsonPath = path.join(process.cwd(), 'package.json');
+const updateLogFile = path.join(process.cwd(), "", "plugin-update-log.txt");
+const ADMOB_NEXTGEN_FILE = "admob-emi-nextgen-1.4.js";
+const ADMOB_NEXTGEN_CONFIG = "admob-ad-configuration-nextgen.json";
+const ADMOB_OLD_CONFIG = "admob-ad-configuration.json";
 
 // Expected plugin list with minimum versions
 /* const requiredPlugins = [
@@ -1216,7 +1219,7 @@ function checkAndCopyResources() {
 
 
 
-function getAdMobConfig() {
+function getAdMobConfig() {
   if (!fileExists(configPath)) {
     throw new Error('❌ capacitor.config.json not found. Ensure this is a Capacitor project.');
   }
@@ -1226,8 +1229,9 @@ function getAdMobConfig() {
     ? JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'))
     : {};
 
-  const legacyAdmobConfig = capacitorConfig.plugins?.AdMob || {};
-  const nextGenAdmobConfig = packageJson.admob || {};
+  const legacyAdmobConfig = capacitorConfig.plugins?.AdMob || {};
+  const nextGenAdmobConfig = packageJson.admob || {};
+  const admobJsonAppIds = getAdmobJsonAppIds();
 
   if (!legacyAdmobConfig && !nextGenAdmobConfig) {
     throw new Error('❌ AdMob configuration is missing in package.json or capacitor.config.json.');
@@ -1241,8 +1245,8 @@ function getAdMobConfig() {
     return { ADMOB_ENABLED: false };
   }
 
-  const androidAppId = nextGenAdmobConfig.androidAppId || legacyAdmobConfig.APP_ID_ANDROID;
-  const iosAppId = nextGenAdmobConfig.iosAppId || legacyAdmobConfig.APP_ID_IOS;
+  const androidAppId = admobJsonAppIds.androidAppId || nextGenAdmobConfig.androidAppId || legacyAdmobConfig.APP_ID_ANDROID;
+  const iosAppId = admobJsonAppIds.iosAppId || nextGenAdmobConfig.iosAppId || legacyAdmobConfig.APP_ID_IOS;
   const userTrackingDescription =
     nextGenAdmobConfig.userTrackingDescription ||
     legacyAdmobConfig.USER_TRACKING_DESCRIPTION ||
@@ -1261,17 +1265,18 @@ function getAdMobConfig() {
   };
 }
 
-function syncNextGenAdmobPackageJsonFromCapacitorConfig() {
-  if (!fileExists(configPath) || !fileExists(packageJsonPath)) {
-    return;
-  }
-
-  const capacitorConfig = JSON.parse(fs.readFileSync(configPath, 'utf8'));
-  const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
-
-  const legacyAdmobConfig = capacitorConfig.plugins?.AdMob || {};
-  const androidAppId = legacyAdmobConfig.APP_ID_ANDROID;
-  const iosAppId = legacyAdmobConfig.APP_ID_IOS;
+function syncNextGenAdmobPackageJsonFromCapacitorConfig() {
+  if (!fileExists(configPath) || !fileExists(packageJsonPath)) {
+    return;
+  }
+
+  const capacitorConfig = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+  const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+
+  const legacyAdmobConfig = capacitorConfig.plugins?.AdMob || {};
+  const admobJsonAppIds = getAdmobJsonAppIds();
+  const androidAppId = admobJsonAppIds.androidAppId || legacyAdmobConfig.APP_ID_ANDROID;
+  const iosAppId = admobJsonAppIds.iosAppId || legacyAdmobConfig.APP_ID_IOS;
 
   if (!androidAppId || !iosAppId) {
     return;
@@ -1319,9 +1324,11 @@ function syncNextGenAdmobPackageJsonFromCapacitorConfig() {
   }
 
   packageJson.admob = mergedAdmobConfig;
-  fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2) + '\n', 'utf8');
-  console.log('✅ package.json AdMob settings synced from capacitor.config.json');
-}
+  fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2) + '\n', 'utf8');
+  console.log(admobJsonAppIds.androidAppId || admobJsonAppIds.iosAppId
+    ? '✅ package.json AdMob settings synced from AdMob configuration JSON'
+    : '✅ package.json AdMob settings synced from capacitor.config.json');
+}
 
 function validateAndroidBuildOptions() {
 
@@ -1607,41 +1614,54 @@ const https = require("https");
 /**
  * Check if file exists on server using HEAD request
  */
-function urlExists(url) {
-  return new Promise(resolve => {
-    const req = https.request(url, { method: "HEAD" }, res => {
-      resolve(res.statusCode === 200);
-    });
-
-    req.on("error", () => resolve(false));
-    req.end();
-  });
-}
+function urlExists(url) {
+  return new Promise(resolve => {
+    const req = https.request(url, { method: "HEAD" }, res => {
+      res.resume();
+      resolve(res.statusCode === 200);
+    });
+
+    req.on("error", () => resolve(false));
+    req.setTimeout(8000, () => {
+      req.destroy();
+      resolve(false);
+    });
+    req.end();
+  });
+}
 
 /**
  * Download file from server
  */
-function downloadFile(url, dest) {
-  return new Promise((resolve, reject) => {
-    const file = fs.createWriteStream(dest);
-
-    https.get(url, response => {
-      if (response.statusCode !== 200) {
-        reject("Download failed");
-        return;
-      }
-
-      response.pipe(file);
+function downloadFile(url, dest) {
+  return new Promise((resolve, reject) => {
+    const file = fs.createWriteStream(dest);
+
+    const req = https.get(url, response => {
+      if (response.statusCode !== 200) {
+        response.resume();
+        file.close(() => fs.unlink(dest, () => {}));
+        reject("Download failed");
+        return;
+      }
+
+      response.pipe(file);
 
       file.on("finish", () => {
         file.close(resolve);
       });
-    }).on("error", err => {
-      fs.unlink(dest, () => {});
-      reject(err);
-    });
-  });
-}
+    }).on("error", err => {
+      fs.unlink(dest, () => {});
+      reject(err);
+    });
+
+    req.setTimeout(30000, () => {
+      req.destroy();
+      file.close(() => fs.unlink(dest, () => {}));
+      reject(new Error(`Download timed out: ${url}`));
+    });
+  });
+}
 
 /**
  * Update imports across src folder
@@ -2679,6 +2699,256 @@ const runNpmCommand = (command) => {
   execSync(command, { stdio: "inherit" });
 };
 
+const ADMOB_NEXTGEN_DEFAULTS = {
+  VERSION: "1.6",
+  ios: { nativeid: "" },
+  android: { nativeid: "" },
+  config: {
+    bannerStartupDelayMs: "",
+    interstitialStartupDelayMs: "",
+    appOpenLoadOnColdStart: "",
+    appOpenStartupDelayMs: "",
+    useAndroidPreloadAds: true,
+    useAndroidBannerPreloadAds: false,
+    preloadBufferSize: 1,
+    consentDebug: false
+  },
+  testid: {
+    nativeid: "",
+    nativeid_android: "ca-app-pub-3940256099942544/2247696110",
+    nativeid_ios: "ca-app-pub-3940256099942544/3986624511"
+  }
+};
+
+function getAdmobJsonPath() {
+  const adsDir = path.join(process.cwd(), "src", "js", "Ads");
+  const possiblePaths = [
+    path.join(adsDir, ADMOB_NEXTGEN_CONFIG),
+    path.join(adsDir, ADMOB_OLD_CONFIG)
+  ];
+
+  return possiblePaths.find(fileExists);
+}
+
+function readJsonSafe(filePath) {
+  try {
+    return filePath && fileExists(filePath)
+      ? JSON.parse(fs.readFileSync(filePath, "utf8"))
+      : null;
+  } catch {
+    return null;
+  }
+}
+
+function pickFirstValue(...values) {
+  return values.find(value => typeof value === "string" && value.trim() !== "") || "";
+}
+
+function getAdmobJsonAppIds(config = readJsonSafe(getAdmobJsonPath())) {
+  return {
+    androidAppId: pickFirstValue(
+      config?.androidAppId,
+      config?.android_app_id,
+      config?.android?.appId,
+      config?.android?.appid,
+      config?.android?.applicationId
+    ),
+    iosAppId: pickFirstValue(
+      config?.iosAppId,
+      config?.ios_app_id,
+      config?.ios?.appId,
+      config?.ios?.appid,
+      config?.ios?.applicationId
+    )
+  };
+}
+
+const mergeObjects = (template, source) => {
+  if (!template || typeof template !== "object" || Array.isArray(template)) {
+    return source !== undefined ? source : template;
+  }
+
+  const output = { ...template };
+
+  if (!source || typeof source !== "object" || Array.isArray(source)) {
+    return output;
+  }
+
+  Object.keys(source).forEach(key => {
+    if (
+      template[key] &&
+      typeof template[key] === "object" &&
+      !Array.isArray(template[key]) &&
+      source[key] &&
+      typeof source[key] === "object" &&
+      !Array.isArray(source[key])
+    ) {
+      output[key] = mergeObjects(template[key], source[key]);
+    } else if (key !== "VERSION") {
+      output[key] = source[key];
+    }
+  });
+
+  return output;
+};
+
+const hasObjectKeys = (value) => {
+  return value && typeof value === "object" && !Array.isArray(value) && Object.keys(value).length > 0;
+};
+
+const buildNextgenAdmobConfigFromOldConfig = (templateConfig, existingNextgenConfig, oldConfig) => {
+  const mergedConfig = mergeObjects(templateConfig, mergeObjects(existingNextgenConfig, oldConfig));
+
+  if (hasObjectKeys(oldConfig)) {
+    if (hasObjectKeys(oldConfig.ios)) {
+      mergedConfig.ios = mergeObjects(ADMOB_NEXTGEN_DEFAULTS.ios, oldConfig.ios);
+    }
+
+    if (hasObjectKeys(oldConfig.android)) {
+      mergedConfig.android = mergeObjects(ADMOB_NEXTGEN_DEFAULTS.android, oldConfig.android);
+    }
+
+    if (hasObjectKeys(oldConfig.testid)) {
+      mergedConfig.testid = mergeObjects(ADMOB_NEXTGEN_DEFAULTS.testid, oldConfig.testid);
+    }
+
+    if (hasObjectKeys(oldConfig.IAP)) {
+      mergedConfig.IAP = oldConfig.IAP;
+    }
+
+    if (hasObjectKeys(oldConfig.config)) {
+      const templateRuntimeConfig = mergeObjects(ADMOB_NEXTGEN_DEFAULTS.config, templateConfig.config || {});
+      const existingRuntimeConfig = existingNextgenConfig.config || {};
+      mergedConfig.config = mergeObjects(templateRuntimeConfig, mergeObjects(existingRuntimeConfig, oldConfig.config));
+    }
+  }
+
+  mergedConfig.VERSION = templateConfig.VERSION || ADMOB_NEXTGEN_DEFAULTS.VERSION;
+
+  return mergedConfig;
+};
+
+const syncAdmobNextgenPackage = () => {
+  if (!fs.existsSync(packageJsonPath)) {
+    console.warn("⚠️ package.json not found. Skipping AdMob nextgen package sync.");
+    return;
+  }
+
+  if (isPackageAvailable("emi-indo-cordova-plugin-admob")) {
+    runNpmCommand("npm uninstall emi-indo-cordova-plugin-admob");
+  } else {
+    console.log("ℹ️ emi-indo-cordova-plugin-admob is not installed.");
+  }
+
+  if (!isPackageAvailable("capacitor-admob-nextgen")) {
+    runNpmCommand("npm install capacitor-admob-nextgen");
+  } else {
+    console.log("ℹ️ capacitor-admob-nextgen is already installed.");
+  }
+};
+
+const downloadOptionalCodeplayFile = async (fileName, destPath) => {
+  const url = `https://htmlcodeplay.com/code-play-plugin/${fileName}`;
+
+  if (!(await urlExists(url))) {
+    return false;
+  }
+
+  await downloadFile(url, destPath);
+  console.log(`⬇ Downloaded → ${fileName}`);
+  return true;
+};
+
+const syncAdmobConfigImports = () => {
+  const adsDir = path.join(process.cwd(), "src", "js", "Ads");
+  if (!fs.existsSync(adsDir)) return;
+
+  const scan = (dir) => {
+    fs.readdirSync(dir, { withFileTypes: true }).forEach(entry => {
+      const fullPath = path.join(dir, entry.name);
+
+      if (entry.isDirectory()) {
+        scan(fullPath);
+        return;
+      }
+
+      if (!/\.(js|mjs|ts|f7)$/.test(entry.name) || entry.name.endsWith(".min.js")) return;
+
+      let content = fs.readFileSync(fullPath, "utf8");
+      if (!content.includes(ADMOB_OLD_CONFIG)) return;
+
+      content = content.split(ADMOB_OLD_CONFIG).join(ADMOB_NEXTGEN_CONFIG);
+      fs.writeFileSync(fullPath, content, "utf8");
+      console.log(`✏️ Updated AdMob config import in ${path.relative(process.cwd(), fullPath)}`);
+    });
+  };
+
+  scan(adsDir);
+};
+
+const ensureAdmobNextgenFiles = async () => {
+  const adsDir = path.join(process.cwd(), "src", "js", "Ads");
+  if (!fs.existsSync(adsDir)) {
+    console.log("ℹ️ Ads folder not found. Skipping AdMob nextgen file sync.");
+    return;
+  }
+
+  const nextgenPath = path.join(adsDir, ADMOB_NEXTGEN_FILE);
+  const nextgenConfigPath = path.join(adsDir, ADMOB_NEXTGEN_CONFIG);
+  const oldConfigPath = path.join(adsDir, ADMOB_OLD_CONFIG);
+  const tempTemplatePath = path.join(adsDir, `${ADMOB_NEXTGEN_CONFIG}.template`);
+
+  if (!fs.existsSync(nextgenPath)) {
+    const downloaded = await downloadOptionalCodeplayFile(ADMOB_NEXTGEN_FILE, nextgenPath);
+    if (!downloaded) {
+      console.error(`❌ ${ADMOB_NEXTGEN_FILE} missing and live download failed.`);
+      process.exit(1);
+    }
+  }
+
+  let templateConfig = ADMOB_NEXTGEN_DEFAULTS;
+
+  if (await downloadOptionalCodeplayFile(ADMOB_NEXTGEN_CONFIG, tempTemplatePath)) {
+    templateConfig = JSON.parse(fs.readFileSync(tempTemplatePath, "utf8"));
+    fs.unlinkSync(tempTemplatePath);
+  } else if (fs.existsSync(nextgenConfigPath)) {
+    templateConfig = mergeObjects(ADMOB_NEXTGEN_DEFAULTS, JSON.parse(fs.readFileSync(nextgenConfigPath, "utf8")));
+  }
+
+  const oldConfig = fs.existsSync(oldConfigPath)
+    ? JSON.parse(fs.readFileSync(oldConfigPath, "utf8"))
+    : {};
+  const existingNextgenConfig = fs.existsSync(nextgenConfigPath)
+    ? JSON.parse(fs.readFileSync(nextgenConfigPath, "utf8"))
+    : {};
+
+  const mergedConfig = buildNextgenAdmobConfigFromOldConfig(templateConfig, existingNextgenConfig, oldConfig);
+
+  const capacitorConfig = readJsonSafe(configPath) || {};
+  const legacyAdmobConfig = capacitorConfig.plugins?.AdMob || {};
+  const mergedAppIds = getAdmobJsonAppIds(mergedConfig);
+  const androidAppId = mergedAppIds.androidAppId || legacyAdmobConfig.APP_ID_ANDROID || "";
+  const iosAppId = mergedAppIds.iosAppId || legacyAdmobConfig.APP_ID_IOS || "";
+
+  if (androidAppId && !mergedAppIds.androidAppId) {
+    mergedConfig.androidAppId = androidAppId;
+  }
+
+  if (iosAppId && !mergedAppIds.iosAppId) {
+    mergedConfig.iosAppId = iosAppId;
+  }
+
+  fs.writeFileSync(nextgenConfigPath, JSON.stringify(mergedConfig, null, 2) + "\n", "utf8");
+  syncAdmobConfigImports();
+  console.log("✅ AdMob nextgen files and configuration are ready.");
+};
+
+const syncAdmobNextgenMigration = async () => {
+  syncAdmobNextgenPackage();
+  await ensureAdmobNextgenFiles();
+  syncAdmobAliasInViteConfig();
+};
+
 const syncSystemBarsSafeAreaMigration = () => {
   if (isPackageAvailable("@capacitor-community/safe-area")) {
     runNpmCommand("npm uninstall @capacitor-community/safe-area");
@@ -3250,9 +3520,10 @@ const checkAdmobConfigurationProperty=()=>{
 
 
 const REQUIRED_CONFIG_KEYS = [
-  "isKidsApp",
-  "isTesting",
-  "isConsoleLogEnabled",
+  "isKidsApp",
+  "isTesting",
+  "consentDebug",
+  "isConsoleLogEnabled",
   "bannerEnabled",
   "interstitialEnabled",
   "appOpenEnabled",
@@ -3368,24 +3639,9 @@ function ensureGitignoreEntry(entry) {
 ensureGitignoreEntry('buildCodeplay/');
 
 
-// Run the validation
-(async () => {
-
-  await loadPluginVersions();   // 🔥 NEW
-
-  syncSystemBarsSafeAreaMigration();
-  await checkPlugins();
-  syncRevenueCatIapSetup();
-  syncFirebaseAnalyticsSetup();
-  checkAndupdateDropInViteConfig();
-  syncAdmobAliasInViteConfig();
-  checkAdmobConfigurationProperty()
-})();
-
-
-// ======================================================
-// Validate theme folder location (src/js/theme is NOT allowed)
-// ======================================================
+// ======================================================
+// Validate theme folder location (src/js/theme is NOT allowed)
+// ======================================================
 
 function validateThemeFolderLocation() {
   const oldThemePath = path.join(process.cwd(), 'src', 'js', 'theme');
@@ -3415,11 +3671,7 @@ function validateThemeFolderLocation() {
     console.log('✅ Theme folder structure validated (src/theme).');
   }
 }
-validateThemeFolderLocation()
-
-
-
-const validateAndRestoreSignDetails=()=>{
+const validateAndRestoreSignDetails=()=>{
 
   // Read config file
   const config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
@@ -3451,18 +3703,7 @@ const validateAndRestoreSignDetails=()=>{
 
 }
 
-validateAndRestoreSignDetails()
-
-
-execSync('node buildCodeplay/fix-onesignal-plugin.js', { stdio: 'inherit' });
-
-
-
-
-
-
-
-//##################################  SystemBars.java update for "@capacitor/android": "^8.3.0" plugin START ###############################
+//##################################  SystemBars.java update for "@capacitor/android": "^8.3.0" plugin START ###############################
 
 
 const filePath = path.join(
@@ -3568,13 +3809,34 @@ function patchFile() {
   console.log("✅ SystemBars.java patched with Codeplay keyboard inset fix!");
 }
 
-//patchFile();
-
-//##################################  SystemBars.java update for "@capacitor/android": "^8.3.0" plugin END ###############################
-
-
-
-
+//patchFile();
+
+//##################################  SystemBars.java update for "@capacitor/android": "^8.3.0" plugin END ###############################
+
+async function main() {
+  validateThemeFolderLocation();
+  validateAndRestoreSignDetails();
+  execSync('node buildCodeplay/fix-onesignal-plugin.js', { stdio: 'inherit' });
+
+  await loadPluginVersions();   // 🔥 NEW
+
+  await syncAdmobNextgenMigration();
+  syncSystemBarsSafeAreaMigration();
+  await checkPlugins();
+  syncRevenueCatIapSetup();
+  syncFirebaseAnalyticsSetup();
+  checkAndupdateDropInViteConfig();
+  checkAdmobConfigurationProperty();
+}
+
+main().catch(err => {
+  console.error(err?.message || err);
+  process.exit(1);
+});
+
+
+
+
 /*
 Release Notes
 

package/package.json

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