codeplay-common 3.2.19 → 4.0.1

package/files/iap-install-2.js

@@ -1,145 +1,145 @@
-const fs = require('fs');
-const path = require('path');
-
-
-
-const androidManifestPath = path.join("android", "app", "src", "main", "AndroidManifest.xml");
-
-// Find the vite config file
-const possibleConfigFiles = ['vite.config.mjs', 'vite.config.js'];
-let viteConfigPath;
-
-for (const configFile of possibleConfigFiles) {
-    const fullPath = path.resolve(configFile);
-    if (fs.existsSync(fullPath)) {
-        viteConfigPath = fullPath;
-        break;
-    }
-}
-
-if (!viteConfigPath) {
-    console.error('Error: No vite.config.mjs or vite.config.js file found.');
-    process.exit(1);
-}
-
-try {
-    // Read vite config file
-    const viteConfigContent = fs.readFileSync(viteConfigPath, 'utf-8');
-
-    // Extract @common alias path
-    const aliasPattern = /'@common':\s*path\.resolve\(__dirname,\s*'(.+?)'\)/;
-    const match = viteConfigContent.match(aliasPattern);
-
-    if (!match) {
-        console.error(`Error: @common alias not found in ${viteConfigPath}`);
-        process.exit(1);
-    }
-
-    const commonFilePath = match[1];
-    const resolvedCommonPath = path.resolve(__dirname, commonFilePath);
-
-    // Read the common file content
-    if (!fs.existsSync(resolvedCommonPath)) {
-        console.error(`Error: Resolved common file does not exist: ${resolvedCommonPath}`);
-        process.exit(1);
-    }
-
-    const commonFileContent = fs.readFileSync(resolvedCommonPath, 'utf-8');
-
-    // Extract _storeid value
-    const storeIdPattern = /export\s+let\s+_storeid\s*=\s*import\.meta\.env\.VITE_STORE_ID\s*\|\|\s*(\d+)\s*;/;
-
-    const storeMatch = commonFileContent.match(storeIdPattern);
-    
-
-    if (!storeMatch) {
-        console.error(`Error: _storeid not found in ${resolvedCommonPath}`);
-        process.exit(1);
-    }
-    
-    const _storeid = parseInt(storeMatch[1], 10);
-    
-    // Determine the store name based on _storeid
-    let storeName = "";
-    if (_storeid === 1) {
-        storeName = "PlayStore";
-    } else if (_storeid === 2) {
-        storeName = "SamsungStore";
-    } else if (_storeid === 7) {
-        storeName = "AmazonStore";
-    } else {
-        console.error(`Error: Unsupported _storeid value: ${_storeid}`);
-        process.exit(1);
-    }
-    
-
-    // Call managePackages with the determined store name
-    managePackages(storeName);
-
-    console.log(commonFilePath, `Success - _storeid found: ${_storeid}, Store: ${storeName}`);
-} catch (error) {
-    console.error('Error:', error);
-    process.exit(1);
-}
-
-function managePackages(store) {
-    console.log(`Managing packages for store: ${store}`);
-
-    let install = "";
-    let uninstall = "";
-
-    //let androidManifestPath = "path/to/AndroidManifest.xml"; // Update this path
-
-    
-    let manifestContent = fs.readFileSync(androidManifestPath, 'utf-8');
-
-    const permissionsToRemove = [
-        'com.android.vending.BILLING',
-        'com.samsung.android.iap.permission.BILLING'
-    ];
-
-    permissionsToRemove.forEach(permission => {
-        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`);
-        }
-    });
-
-    // Write the updated content back to the file
-    fs.writeFileSync(androidManifestPath, manifestContent, 'utf-8');
-
-    if (store === "PlayStore") {
-        install = '@revenuecat/purchases-capacitor';
-        uninstall = 'cordova-plugin-samsungiap';
-    } else if (store === "AmazonStore") {
-        install = '@revenuecat/purchases-capacitor';
-        uninstall = 'cordova-plugin-samsungiap';
-    } else if (store === "SamsungStore") {
-        install = 'cordova-plugin-samsungiap';
-        uninstall = '@revenuecat/purchases-capacitor';
-    } else {
-        console.log("No valid store specified. Uninstalling both plugins.");
-        try {
-            require('child_process').execSync(`npm uninstall cordova-plugin-samsungiap`, { stdio: 'inherit' });
-            require('child_process').execSync(`npm uninstall @revenuecat/purchases-capacitor`, { stdio: 'inherit' });
-            console.log("Both plugins uninstalled successfully.");
-        } catch (err) {
-            console.error("Error uninstalling plugins:", err);
-        }
-        return;
-    }
-
-    console.log(`Installing ${install} and uninstalling ${uninstall} for ${store}...`);
-    try {
-        if (install) {
-            require('child_process').execSync(`npm install ${install}`, { stdio: 'inherit' });
-        }
-        if (uninstall) {
-            require('child_process').execSync(`npm uninstall ${uninstall}`, { stdio: 'inherit' });
-        }
-        console.log(`${install} installed and ${uninstall} uninstalled successfully.`);
-    } catch (err) {
-        console.error(`Error managing packages for ${store}:`, err);
-    }
-}
+const fs = require('fs');
+const path = require('path');
+
+
+
+const androidManifestPath = path.join("android", "app", "src", "main", "AndroidManifest.xml");
+
+// Find the vite config file
+const possibleConfigFiles = ['vite.config.mjs', 'vite.config.js'];
+let viteConfigPath;
+
+for (const configFile of possibleConfigFiles) {
+    const fullPath = path.resolve(configFile);
+    if (fs.existsSync(fullPath)) {
+        viteConfigPath = fullPath;
+        break;
+    }
+}
+
+if (!viteConfigPath) {
+    console.error('Error: No vite.config.mjs or vite.config.js file found.');
+    process.exit(1);
+}
+
+try {
+    // Read vite config file
+    const viteConfigContent = fs.readFileSync(viteConfigPath, 'utf-8');
+
+    // Extract @common alias path
+    const aliasPattern = /'@common':\s*path\.resolve\(__dirname,\s*'(.+?)'\)/;
+    const match = viteConfigContent.match(aliasPattern);
+
+    if (!match) {
+        console.error(`Error: @common alias not found in ${viteConfigPath}`);
+        process.exit(1);
+    }
+
+    const commonFilePath = match[1];
+    const resolvedCommonPath = path.resolve(__dirname, commonFilePath);
+
+    // Read the common file content
+    if (!fs.existsSync(resolvedCommonPath)) {
+        console.error(`Error: Resolved common file does not exist: ${resolvedCommonPath}`);
+        process.exit(1);
+    }
+
+    const commonFileContent = fs.readFileSync(resolvedCommonPath, 'utf-8');
+
+    // Extract _storeid value
+    const storeIdPattern = /export\s+let\s+_storeid\s*=\s*import\.meta\.env\.VITE_STORE_ID\s*\|\|\s*(\d+)\s*;/;
+
+    const storeMatch = commonFileContent.match(storeIdPattern);
+    
+
+    if (!storeMatch) {
+        console.error(`Error: _storeid not found in ${resolvedCommonPath}`);
+        process.exit(1);
+    }
+    
+    const _storeid = parseInt(storeMatch[1], 10);
+    
+    // Determine the store name based on _storeid
+    let storeName = "";
+    if (_storeid === 1) {
+        storeName = "PlayStore";
+    } else if (_storeid === 2) {
+        storeName = "SamsungStore";
+    } else if (_storeid === 7) {
+        storeName = "AmazonStore";
+    } else {
+        console.error(`Error: Unsupported _storeid value: ${_storeid}`);
+        process.exit(1);
+    }
+    
+
+    // Call managePackages with the determined store name
+    managePackages(storeName);
+
+    console.log(commonFilePath, `Success - _storeid found: ${_storeid}, Store: ${storeName}`);
+} catch (error) {
+    console.error('Error:', error);
+    process.exit(1);
+}
+
+function managePackages(store) {
+    console.log(`Managing packages for store: ${store}`);
+
+    let install = "";
+    let uninstall = "";
+
+    //let androidManifestPath = "path/to/AndroidManifest.xml"; // Update this path
+
+    
+    let manifestContent = fs.readFileSync(androidManifestPath, 'utf-8');
+
+    const permissionsToRemove = [
+        'com.android.vending.BILLING',
+        'com.samsung.android.iap.permission.BILLING'
+    ];
+
+    permissionsToRemove.forEach(permission => {
+        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`);
+        }
+    });
+
+    // Write the updated content back to the file
+    fs.writeFileSync(androidManifestPath, manifestContent, 'utf-8');
+
+    if (store === "PlayStore") {
+        install = '@revenuecat/purchases-capacitor';
+        uninstall = 'cordova-plugin-samsungiap';
+    } else if (store === "AmazonStore") {
+        install = '@revenuecat/purchases-capacitor';
+        uninstall = 'cordova-plugin-samsungiap';
+    } else if (store === "SamsungStore") {
+        install = 'cordova-plugin-samsungiap';
+        uninstall = '@revenuecat/purchases-capacitor';
+    } else {
+        console.log("No valid store specified. Uninstalling both plugins.");
+        try {
+            require('child_process').execSync(`npm uninstall cordova-plugin-samsungiap`, { stdio: 'inherit' });
+            require('child_process').execSync(`npm uninstall @revenuecat/purchases-capacitor`, { stdio: 'inherit' });
+            console.log("Both plugins uninstalled successfully.");
+        } catch (err) {
+            console.error("Error uninstalling plugins:", err);
+        }
+        return;
+    }
+
+    console.log(`Installing ${install} and uninstalling ${uninstall} for ${store}...`);
+    try {
+        if (install) {
+            require('child_process').execSync(`npm install ${install}`, { stdio: 'inherit' });
+        }
+        if (uninstall) {
+            require('child_process').execSync(`npm uninstall ${uninstall}`, { stdio: 'inherit' });
+        }
+        console.log(`${install} installed and ${uninstall} uninstalled successfully.`);
+    } catch (err) {
+        console.error(`Error managing packages for ${store}:`, err);
+    }
+}

package/files/ionic.config.json

@@ -1,7 +1,7 @@
-{
-  "name": "merbin-test-app",
-  "integrations": {
-    "capacitor": {}
-  },
-  "type": "custom"
+{
+  "name": "merbin-test-app",
+  "integrations": {
+    "capacitor": {}
+  },
+  "type": "custom"
 }

package/files/scripts/setup-baseline-profile.js

@@ -0,0 +1,241 @@
+const fs = require('fs');
+const path = require('path');
+
+const rootDir = path.resolve(__dirname, '..');
+const androidDir = path.join(rootDir, 'android');
+const capacitorConfigPath = path.join(rootDir, 'capacitor.config.json');
+const backupProfile = path.join(rootDir, 'baselineProfiles', 'baseline-prof.txt');
+const generatedProfile = path.join(
+  androidDir,
+  'app',
+  'src',
+  'main',
+  'generated',
+  'baselineProfiles',
+  'baseline-prof.txt'
+);
+
+function readFile(filePath) {
+  return fs.readFileSync(filePath, 'utf8');
+}
+
+function writeFile(filePath, content) {
+  fs.mkdirSync(path.dirname(filePath), { recursive: true });
+  fs.writeFileSync(filePath, content);
+}
+
+function patchFile(filePath, patcher) {
+  const before = readFile(filePath);
+  const after = patcher(before);
+  if (after !== before) {
+    writeFile(filePath, after);
+    console.log(`Updated ${path.relative(rootDir, filePath)}`);
+  }
+}
+
+function insertAfter(content, marker, insertion) {
+  if (content.includes(insertion.trim())) return content;
+  const index = content.indexOf(marker);
+  if (index === -1) return `${content.trimEnd()}\n${insertion}\n`;
+  const insertAt = index + marker.length;
+  return `${content.slice(0, insertAt)}${insertion}${content.slice(insertAt)}`;
+}
+
+function insertBeforeClosingBrace(content, blockStart, insertion) {
+  if (content.includes(insertion.trim())) return content;
+  const startIndex = content.indexOf(blockStart);
+  if (startIndex === -1) return content;
+
+  let depth = 0;
+  for (let index = startIndex; index < content.length; index += 1) {
+    const char = content[index];
+    if (char === '{') depth += 1;
+    if (char === '}') {
+      depth -= 1;
+      if (depth === 0) {
+        return `${content.slice(0, index).trimEnd()}\n${insertion}\n${content.slice(index)}`;
+      }
+    }
+  }
+  return content;
+}
+
+function getAppIdFromCapacitorConfig() {
+  if (!fs.existsSync(capacitorConfigPath)) {
+    throw new Error(`capacitor.config.json not found at ${capacitorConfigPath}`);
+  }
+
+  let config;
+  try {
+    config = JSON.parse(readFile(capacitorConfigPath));
+  } catch (error) {
+    throw new Error(`Failed to parse capacitor.config.json: ${error.message}`);
+  }
+
+  const appId = config?.appId;
+  if (typeof appId !== 'string' || !appId.trim()) {
+    throw new Error('capacitor.config.json does not contain a valid appId.');
+  }
+
+  return appId.trim();
+}
+
+function sanitizeJavaPackageSegment(segment) {
+  const safeSegment = segment.replace(/[^a-zA-Z0-9_]/g, '_');
+  return safeSegment.replace(/^[0-9]/, (match) => `_${match}`) || 'app';
+}
+
+function toSafeJavaPackageName(value) {
+  return value
+    .split('.')
+    .map(sanitizeJavaPackageSegment)
+    .join('.');
+}
+
+function getBaselineProfileBuildGradle(modulePackage) {
+  return `apply plugin: 'com.android.test'\napply plugin: 'androidx.baselineprofile'\n\nandroid {\n    namespace = \"${modulePackage}\"\n    compileSdk = rootProject.ext.compileSdkVersion\n\n    defaultConfig {\n        minSdkVersion rootProject.ext.minSdkVersion\n        targetSdkVersion rootProject.ext.targetSdkVersion\n        testInstrumentationRunner \"androidx.test.runner.AndroidJUnitRunner\"\n    }\n\n    targetProjectPath = \":app\"\n}\n\nbaselineProfile {\n    useConnectedDevices true\n}\n\ndependencies {\n    implementation \"androidx.benchmark:benchmark-macro-junit4:1.4.0\"\n    implementation \"androidx.test.ext:junit:$androidxJunitVersion\"\n    implementation \"androidx.test.uiautomator:uiautomator:2.3.0\"\n}\n`;
+}
+
+const baselineProfileManifest = `<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
+`;
+
+function getBaselineProfileGenerator(modulePackage, appId) {
+  return `package ${modulePackage};\n\nimport androidx.benchmark.macro.junit4.BaselineProfileRule;\nimport androidx.test.ext.junit.runners.AndroidJUnit4;\n\nimport kotlin.Unit;\n\nimport org.junit.Rule;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\n\n@RunWith(AndroidJUnit4.class)\npublic class BaselineProfileGenerator {\n    private static final String PACKAGE_NAME = \"${appId}\";\n\n    @Rule\n    public final BaselineProfileRule baselineProfileRule = new BaselineProfileRule();\n\n    @Test\n    public void generateStartupProfile() {\n        baselineProfileRule.collect(\n                PACKAGE_NAME,\n                15,\n                3,\n                null,\n                true,\n                true,\n                scope -> {\n                    scope.getDevice().pressHome();\n                    scope.startActivityAndWait();\n                    scope.getDevice().waitForIdle();\n                    waitForWebViewStartup();\n                    scope.killProcess();\n                    return Unit.INSTANCE;\n                }\n        );\n    }\n\n    private void waitForWebViewStartup() {\n        try {\n            Thread.sleep(3000);\n        } catch (InterruptedException exception) {\n            Thread.currentThread().interrupt();\n        }\n    }\n}\n`;
+}
+
+function ensureBaselineProfilePlugin() {
+  const rootBuildGradle = path.join(androidDir, 'build.gradle');
+  patchFile(rootBuildGradle, (content) =>
+    insertAfter(
+      content,
+      "classpath 'com.google.gms:google-services:4.4.4'",
+      "\n        classpath 'androidx.baselineprofile:androidx.baselineprofile.gradle.plugin:1.4.1'"
+    )
+  );
+}
+
+function ensureSettingsModule() {
+  const settingsGradle = path.join(androidDir, 'settings.gradle');
+  patchFile(settingsGradle, (content) =>
+    insertAfter(
+      content,
+      "include ':app'",
+      "\ninclude ':baselineprofile'\nproject(':baselineprofile').projectDir = new File('./baselineprofile/')\n"
+    )
+  );
+}
+
+function ensureAppGradle() {
+  const appBuildGradle = path.join(androidDir, 'app', 'build.gradle');
+  patchFile(appBuildGradle, (content) => {
+    let next = insertAfter(
+      content,
+      "apply plugin: 'com.android.application'",
+      "\napply plugin: 'androidx.baselineprofile'"
+    );
+
+    if (!next.includes('androidx.profileinstaller:profileinstaller')) {
+      next = insertBeforeClosingBrace(
+        next,
+        'dependencies {',
+        '    implementation "androidx.profileinstaller:profileinstaller:1.4.1"'
+      );
+    }
+
+    if (!next.includes("baselineProfile project(':baselineprofile')")) {
+      next = insertBeforeClosingBrace(
+        next,
+        'dependencies {',
+        "    baselineProfile project(':baselineprofile')"
+      );
+    }
+
+    if (!next.includes('automaticGenerationDuringBuild false')) {
+      next = insertAfter(
+        next,
+        "apply from: 'capacitor.build.gradle'",
+        '\n\nbaselineProfile {\n    automaticGenerationDuringBuild false\n    saveInSrc true\n    mergeIntoMain true\n}\n'
+      );
+    }
+
+    return next;
+  });
+}
+
+function ensureBaselineProfileModule(appId) {
+  const safeAppId = toSafeJavaPackageName(appId);
+  const modulePackage = `${safeAppId}.baselineprofile`;
+
+  writeFile(path.join(androidDir, 'baselineprofile', 'build.gradle'), getBaselineProfileBuildGradle(modulePackage));
+  writeFile(
+    path.join(androidDir, 'baselineprofile', 'src', 'main', 'AndroidManifest.xml'),
+    baselineProfileManifest
+  );
+  writeFile(
+    path.join(
+      androidDir,
+      'baselineprofile',
+      'src',
+      'main',
+      'java',
+      ...safeAppId.split('.'),
+      'baselineprofile',
+      'BaselineProfileGenerator.java'
+    ),
+    getBaselineProfileGenerator(modulePackage, appId)
+  );
+  console.log('Ensured android/baselineprofile module');
+}
+
+function syncGeneratedProfileBackup() {
+  const generatedExists = fs.existsSync(generatedProfile);
+  const backupExists = fs.existsSync(backupProfile);
+
+  if (!generatedExists && !backupExists) {
+    console.log('No baseline-prof.txt found yet. Run: cd android && .\\gradlew.bat :app:generateBaselineProfile --console=plain');
+    return;
+  }
+
+  if (generatedExists && !backupExists) {
+    fs.mkdirSync(path.dirname(backupProfile), { recursive: true });
+    fs.copyFileSync(generatedProfile, backupProfile);
+    console.log('Backed up generated baseline profile to baselineProfiles/baseline-prof.txt');
+    return;
+  }
+
+  if (!generatedExists && backupExists) {
+    fs.mkdirSync(path.dirname(generatedProfile), { recursive: true });
+    fs.copyFileSync(backupProfile, generatedProfile);
+    console.log('Restored baseline profile into android/app/src/main/generated/baselineProfiles');
+    return;
+  }
+
+  const generatedTime = fs.statSync(generatedProfile).mtimeMs;
+  const backupTime = fs.statSync(backupProfile).mtimeMs;
+  if (generatedTime >= backupTime) {
+    fs.copyFileSync(generatedProfile, backupProfile);
+    console.log('Updated baseline profile backup from generated profile');
+  } else {
+    fs.copyFileSync(backupProfile, generatedProfile);
+    console.log('Restored generated baseline profile from backup');
+  }
+}
+
+function main() {
+  const appId = getAppIdFromCapacitorConfig();
+
+  if (!fs.existsSync(androidDir)) {
+    console.log('Android platform folder is missing. Run `npx cap add android` first, then rerun this script.');
+    return;
+  }
+
+  ensureBaselineProfilePlugin();
+  ensureSettingsModule();
+  ensureAppGradle();
+  ensureBaselineProfileModule(appId);
+  syncGeneratedProfileBackup();
+  console.log('Baseline Profile setup is ready.');
+}
+
+main();

package/package.json

@@ -1,16 +1,16 @@
-{
-  "name": "codeplay-common",
-  "version": "3.2.19",
-  "description": "Common build scripts and files",
-  "scripts": {
-	"postinstall": "node scripts/sync-files.js",
-	"preinstall": "node scripts/uninstall.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/merbin2012/codeplay-common.git"
-  },
-  "author": "Codeplay Technologies",
-  "license": "MIT"
-}
-
+{
+  "name": "codeplay-common",
+  "version": "4.0.1",
+  "description": "Common build scripts and files",
+  "scripts": {
+	"postinstall": "node scripts/sync-files.js",
+	"preinstall": "node scripts/uninstall.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/merbin2012/codeplay-common.git"
+  },
+  "author": "Codeplay Technologies",
+  "license": "MIT"
+}
+