codeplay-common 4.3.8 → 4.3.9

package/files/take-screen-video.js

@@ -123,14 +123,57 @@ function getConnectedDevice() {
   return devices[0];
 }
 
-function stopScreenRecording(recording) {
-  // Allocate a remote pseudo-terminal so Ctrl+C is delivered as an interrupt
-  // to screenrecord. Without a PTY, adb treats it as ordinary pipe data.
+function getScreenRecordingPids(deviceId) {
+  const result = spawnSync('adb', ['-s', deviceId, 'shell', 'pidof', 'screenrecord'], {
+    encoding: 'utf8',
+    windowsHide: true,
+  });
+
+  if (result.error) throw result.error;
+
+  const output = String(result.stdout || '').trim();
+  if (result.status === 1 && !output) return [];
+  if (result.status !== 0) {
+    throw new Error(
+      String(result.stderr || output || `adb exited with code ${result.status}.`).trim(),
+    );
+  }
+
+  return output.split(/\s+/).filter(Boolean);
+}
+
+function waitForScreenRecordingPid(deviceId) {
+  for (let attempt = 0; attempt < 50; attempt += 1) {
+    const pids = getScreenRecordingPids(deviceId);
+    if (pids.length === 1) return pids[0];
+    if (pids.length > 1) {
+      throw new Error(`Multiple screenrecord processes are running: ${pids.join(', ')}.`);
+    }
+    wait(100);
+  }
+
+  throw new Error('Android screenrecord did not start within 5 seconds.');
+}
+
+function stopScreenRecording(deviceId, recordingPid) {
+  // SIGINT lets screenrecord write the MP4 index before its adb shell exits.
+  run('adb', ['-s', deviceId, 'shell', 'kill', '-2', recordingPid]);
+}
+
+async function waitForRecordingFinalization(recordingCompletion) {
+  let timeout;
   try {
-    recording.child.stdin.write('\u0003');
-    recording.child.stdin.end();
-  } catch {
-    // The adb shell may already have closed its input stream.
+    await Promise.race([
+      recordingCompletion,
+      new Promise((resolve, reject) => {
+        timeout = setTimeout(
+          () => reject(new Error('The recorder did not finalize within 15 seconds.')),
+          15000,
+        );
+      }),
+    ]);
+  } finally {
+    clearTimeout(timeout);
   }
 }
 
@@ -323,6 +366,7 @@ async function recordConnectedDevice(options, destinationPath) {
   );
 
   let recording;
+  let recordingPid = '';
   if (audio === 'with') {
     const scrcpyCommand = getScrcpyCommand();
     if (!scrcpyCommand) {
@@ -344,13 +388,21 @@ async function recordConnectedDevice(options, destinationPath) {
     }
     recording = runAsync(scrcpyCommand, scrcpyArguments);
   } else {
+    const existingPids = getScreenRecordingPids(deviceId);
+    if (existingPids.length) {
+      throw new Error(
+        `Android screenrecord is already running (PID ${existingPids.join(', ')}). Stop it before recording.`,
+      );
+    }
+    run('adb', ['-s', deviceId, 'shell', 'rm', '-f', deviceRecordingPath]);
     recording = runAsync('adb', [
       '-s', deviceId,
-      'shell', '-t', 'screenrecord',
+      'shell', 'screenrecord',
       '--bit-rate', '12000000',
       '--time-limit', String(duration),
       deviceRecordingPath,
-    ], { stdio: ['pipe', 'inherit', 'inherit'] });
+    ], { stdio: ['ignore', 'inherit', 'inherit'] });
+    recordingPid = waitForScreenRecordingPid(deviceId);
   }
 
   let manualStopRequested = false;
@@ -366,20 +418,13 @@ async function recordConnectedDevice(options, destinationPath) {
         'shell', 'pkill', '-TERM', '-f', 'com.genymobile.scrcpy.Server',
       ]);
     } else {
-      stopScreenRecording(recording);
+      stopScreenRecording(deviceId, recordingPid);
     }
   } else if (stopReason === 'maximum-duration') {
     console.log(`Safety maximum reached after ${duration} seconds.`);
   }
 
-  if (manualStopRequested) {
-    // Vendor recorder services can leave adb.exe waiting after the recording
-    // file has already been finalized. Give the device a moment, but do not
-    // block the pull forever on that wrapper process.
-    wait(2000);
-  } else {
-    await recording.completion;
-  }
+  await waitForRecordingFinalization(recording.completion);
 
   if (audio === 'without') {
     try {

package/package.json

@@ -1,15 +1,15 @@
-{
-  "name": "codeplay-common",
-  "version": "4.3.8",
-  "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.3.9",
+  "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"
+}

package/scripts/sync-files.js

@@ -1,104 +1,104 @@
-const fs = require("fs");
-const path = require("path");
-
-const projectRoot = path.resolve(__dirname, "../../../"); // Your project's root
-const commonBuildPath = path.join(__dirname, "../files"); // Path to common files
-const buildCodeplayPath = path.join(commonBuildPath, "buildCodeplay"); // Correct path
-const packageJsonPath = path.join(projectRoot, "package.json");
-
-// Ensure package.json exists
-if (!fs.existsSync(packageJsonPath)) {
-    process.stderr.write("❌ package.json not found!\n");
-    process.exit(1);
-}
-
-const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
-
-function copyFolderSync(source, destination) {
-    try {
-        fs.cpSync(source, destination, { recursive: true });
-        process.stdout.write(`✅ Copied folder: ${source} -> ${destination}\n`);
-    } catch (error) {
-        process.stderr.write(`⚠️ Failed to copy folder: ${source} - ${error.message}\n`);
-    }
-}
-
-// Copy all files from `common-build-files/files/` to the project root
-fs.readdirSync(commonBuildPath).forEach(file => {
-    const sourcePath = path.join(commonBuildPath, file);
-    const destPath = path.join(projectRoot, file);
-
-    if (fs.statSync(sourcePath).isDirectory()) {
-        copyFolderSync(sourcePath, destPath);
-    } else {
-        try {
-            fs.copyFileSync(sourcePath, destPath);
-            process.stdout.write(`✅ Copied file: ${file}\n`);
-        } catch (error) {
-            process.stderr.write(`⚠️ Failed to copy file: ${file} - ${error.message}\n`);
-        }
-    }
-});
-
+const fs = require("fs");
+const path = require("path");
+
+const projectRoot = path.resolve(__dirname, "../../../"); // Your project's root
+const commonBuildPath = path.join(__dirname, "../files"); // Path to common files
+const buildCodeplayPath = path.join(commonBuildPath, "buildCodeplay"); // Correct path
+const packageJsonPath = path.join(projectRoot, "package.json");
+
+// Ensure package.json exists
+if (!fs.existsSync(packageJsonPath)) {
+    process.stderr.write("❌ package.json not found!\n");
+    process.exit(1);
+}
+
+const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
+
+function copyFolderSync(source, destination) {
+    try {
+        fs.cpSync(source, destination, { recursive: true });
+        process.stdout.write(`✅ Copied folder: ${source} -> ${destination}\n`);
+    } catch (error) {
+        process.stderr.write(`⚠️ Failed to copy folder: ${source} - ${error.message}\n`);
+    }
+}
+
+// Copy all files from `common-build-files/files/` to the project root
+fs.readdirSync(commonBuildPath).forEach(file => {
+    const sourcePath = path.join(commonBuildPath, file);
+    const destPath = path.join(projectRoot, file);
+
+    if (fs.statSync(sourcePath).isDirectory()) {
+        copyFolderSync(sourcePath, destPath);
+    } else {
+        try {
+            fs.copyFileSync(sourcePath, destPath);
+            process.stdout.write(`✅ Copied file: ${file}\n`);
+        } catch (error) {
+            process.stderr.write(`⚠️ Failed to copy file: ${file} - ${error.message}\n`);
+        }
+    }
+});
+
 // Function to get the latest versioned file from files/buildCodeplay
-function getLatestFile(prefix) {
-    if (!fs.existsSync(buildCodeplayPath)) return null; // Ensure directory exists
-
-    const files = fs.readdirSync(buildCodeplayPath).filter(file => file.startsWith(prefix));
-    if (files.length === 0) return null;
-    files.sort((a, b) => b.localeCompare(a, undefined, { numeric: true }));
-    return files[0];
-}
-
-// Detect latest script versions
-const latestSplashScreen = getLatestFile("add-splash-screen-");
-const latestSplashAnimation = getLatestFile("setSplashAnimation-");
-const latestCodeplayBuild = getLatestFile("codeplayBeforeBuild-");
-
-const latestPackageIdModification = getLatestFile("packageidBaseModification-");
-const baselineProfileSetupScript = "node scripts/setup-baseline-profile.js";
-const baselineProfileGenerateScript = "cd android && gradlew.bat :app:generateBaselineProfile --console=plain";
-
-function appendIfMissing(base, suffix) {
-  if (!suffix) return base;
-  if (!base || typeof base !== "string") return suffix;
-  if (base.includes(suffix)) return base;
-  return `${base} && ${suffix}`;
-}
-
-
-// Ensure scripts object exists
-packageJson.scripts = packageJson.scripts || {};
-
-// Update or add necessary scripts
-if (latestCodeplayBuild) {
-    packageJson.scripts["build"] = `node buildCodeplay/${latestCodeplayBuild} && node buildCodeplay/${latestPackageIdModification} && cross-env NODE_ENV=production vite build --logLevel warn`;
-}
-if (latestSplashScreen && latestSplashAnimation) {
-    packageJson.scripts["capacitor:sync:after"] = appendIfMissing(
-        `node buildCodeplay/${latestSplashScreen} && node buildCodeplay/${latestSplashAnimation} && node buildCodeplay/manifestModification.js`,
-        baselineProfileSetupScript
-    );
-    //node buildCodeplay/ios-emi-admob-modification.js && 
-} else if (packageJson.scripts["capacitor:sync:after"]) {
-    packageJson.scripts["capacitor:sync:after"] = appendIfMissing(
-        packageJson.scripts["capacitor:sync:after"],
-        baselineProfileSetupScript
-    );
-}
-packageJson.scripts["baseline-profile:setup"] = baselineProfileSetupScript;
-packageJson.scripts["baseline-profile:generate"] = baselineProfileGenerateScript;
-
-packageJson.scripts["ionic:build"] = "npm run build";
-packageJson.scripts["ionic:serve"] = "cross-env NODE_ENV=development vite";
-packageJson.scripts["build:storeid1"] = "vite build --mode storeid1";
-packageJson.scripts["build:storeid2"] = "vite build --mode storeid2";
-packageJson.scripts["build:storeid3"] = "vite build --mode storeid3";
-packageJson.scripts["build:storeid4"] = "vite build --mode storeid4";
-packageJson.scripts["build:storeid5"] = "vite build --mode storeid5";
-//packageJson.scripts["build:storeid6"] = "vite build --mode storeid6";
-packageJson.scripts["build:storeid7"] = "vite build --mode storeid7";
-packageJson.scripts["build:storeid8"] = "vite build --mode storeid8";
-// Save changes
-fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2), "utf8");
-process.stdout.write("✅ package.json updated!\n");
+function getLatestFile(prefix) {
+    if (!fs.existsSync(buildCodeplayPath)) return null; // Ensure directory exists
+
+    const files = fs.readdirSync(buildCodeplayPath).filter(file => file.startsWith(prefix));
+    if (files.length === 0) return null;
+    files.sort((a, b) => b.localeCompare(a, undefined, { numeric: true }));
+    return files[0];
+}
+
+// Detect latest script versions
+const latestSplashScreen = getLatestFile("add-splash-screen-");
+const latestSplashAnimation = getLatestFile("setSplashAnimation-");
+const latestCodeplayBuild = getLatestFile("codeplayBeforeBuild-");
+
+const latestPackageIdModification = getLatestFile("packageidBaseModification-");
+const baselineProfileSetupScript = "node scripts/setup-baseline-profile.js";
+const baselineProfileGenerateScript = "cd android && gradlew.bat :app:generateBaselineProfile --console=plain";
+
+function appendIfMissing(base, suffix) {
+  if (!suffix) return base;
+  if (!base || typeof base !== "string") return suffix;
+  if (base.includes(suffix)) return base;
+  return `${base} && ${suffix}`;
+}
+
+
+// Ensure scripts object exists
+packageJson.scripts = packageJson.scripts || {};
+
+// Update or add necessary scripts
+if (latestCodeplayBuild) {
+    packageJson.scripts["build"] = `node buildCodeplay/${latestCodeplayBuild} && node buildCodeplay/${latestPackageIdModification} && cross-env NODE_ENV=production vite build --logLevel warn`;
+}
+if (latestSplashScreen && latestSplashAnimation) {
+    packageJson.scripts["capacitor:sync:after"] = appendIfMissing(
+        `node buildCodeplay/${latestSplashScreen} && node buildCodeplay/${latestSplashAnimation} && node buildCodeplay/manifestModification.js`,
+        baselineProfileSetupScript
+    );
+    //node buildCodeplay/ios-emi-admob-modification.js && 
+} else if (packageJson.scripts["capacitor:sync:after"]) {
+    packageJson.scripts["capacitor:sync:after"] = appendIfMissing(
+        packageJson.scripts["capacitor:sync:after"],
+        baselineProfileSetupScript
+    );
+}
+packageJson.scripts["baseline-profile:setup"] = baselineProfileSetupScript;
+packageJson.scripts["baseline-profile:generate"] = baselineProfileGenerateScript;
+
+packageJson.scripts["ionic:build"] = "npm run build";
+packageJson.scripts["ionic:serve"] = "cross-env NODE_ENV=development vite";
+packageJson.scripts["build:storeid1"] = "vite build --mode storeid1";
+packageJson.scripts["build:storeid2"] = "vite build --mode storeid2";
+packageJson.scripts["build:storeid3"] = "vite build --mode storeid3";
+packageJson.scripts["build:storeid4"] = "vite build --mode storeid4";
+packageJson.scripts["build:storeid5"] = "vite build --mode storeid5";
+//packageJson.scripts["build:storeid6"] = "vite build --mode storeid6";
+packageJson.scripts["build:storeid7"] = "vite build --mode storeid7";
+packageJson.scripts["build:storeid8"] = "vite build --mode storeid8";
+// Save changes
+fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2), "utf8");
+process.stdout.write("✅ package.json updated!\n");

package/scripts/uninstall.js

@@ -1,109 +1,109 @@
-// Define file prefixes to delete
-const filePrefixes = [
-    "add-splash-screen",
-    "setSplashAnimation",
-    "codeplayBeforeBuild",
-    "finalrelease"
-];
-
-const fs = require("fs");
-const path = require("path");
-
-const projectRoot = path.resolve(__dirname, "../../../"); // Project root
-const commonBuildPath = path.join(__dirname, "../files"); // Path where files were copied from
-const splashXmlPath = path.join(projectRoot, "buildCodeplay"); // Path to splashxml folder
-const baselineProfileSetupScript = path.join(projectRoot, "scripts", "setup-baseline-profile.js");
-const baselineProfileBackup = path.join(projectRoot, "baselineProfiles", "baseline-prof.txt");
-
-const isAgentInstructionAsset = (file) => {
-    const normalizedName = file.toLowerCase();
-    return normalizedName === "agents" || normalizedName === "agents.md";
-};
-
-process.stdout.write("🚀 Uninstalling: Removing old and copied files...\n");
-
-const removeDirectory = (dirPath) => {
-    if (fs.existsSync(dirPath)) {
-        fs.readdirSync(dirPath).forEach(file => {
-            const currentPath = path.join(dirPath, file);
-            if (fs.lstatSync(currentPath).isDirectory()) {
-                removeDirectory(currentPath);
-            } else {
-                fs.unlinkSync(currentPath);
-            }
-        });
-        fs.rmdirSync(dirPath);
-        process.stdout.write(`🗑️ Removed folder: ${dirPath}\n`);
-    }
-};
-
-removeDirectory(splashXmlPath);
-removeDirectory(path.join(projectRoot, "splashxml")); // Remove old splashxml folder
-
-// Step 1: Find all matching files in the project directory
-const filePatternsToRemove = [
-    /^add-splash-screen-.*$/, 
-    /^setSplashAnimation-.*$/, 
-    /^codeplayBeforeBuild-.*$/, 
-    /^modify-plugin-xml\.xml$/, 
-    /^finalrelease.*$/, 
-    /^iap-install-\d+(\.\d+)?\.js$/,
-    /^\.env\.storeid[1-7]$/, 
-    /^modify-plugin-xml\.js$/
-];
-
-const filesInProject = fs.readdirSync(projectRoot);
-
-filesInProject.forEach(file => {
-    if (filePatternsToRemove.some(pattern => pattern.test(file))) {
-        const filePath = path.join(projectRoot, file);
-        try {
-            fs.unlinkSync(filePath);
-            process.stdout.write(`🗑️ Removed file: ${filePath}\n`);
-        } catch (error) {
-            process.stderr.write(`⚠️ Failed to remove ${filePath}: ${error.message}\n`);
-        }
-    }
-});
-
-// Remove files and folders listed in commonBuildPath
-if (fs.existsSync(commonBuildPath)) {
-    fs.readdirSync(commonBuildPath).forEach(file => {
-        const destPath = path.join(projectRoot, file);
-        if (file === "scripts" || isAgentInstructionAsset(file)) {
-            return;
-        }
-        if (fs.existsSync(destPath)) {
-            try {
-                if (fs.lstatSync(destPath).isDirectory()) {
-                    removeDirectory(destPath);
-                } else {
-                    fs.unlinkSync(destPath);
-                    process.stdout.write(`🗑️ Removed file: ${destPath}\n`);
-                }
-            } catch (error) {
-                process.stderr.write(`⚠️ Failed to remove ${destPath}: ${error.message}\n`);
-            }
-        }
-    });
-}
-
-if (fs.existsSync(baselineProfileSetupScript)) {
-    try {
-        fs.unlinkSync(baselineProfileSetupScript);
-        process.stdout.write(`🗑️ Removed file: ${baselineProfileSetupScript}\n`);
-    } catch (error) {
-        process.stderr.write(`⚠️ Failed to remove ${baselineProfileSetupScript}: ${error.message}\n`);
-    }
-}
-
-if (fs.existsSync(baselineProfileBackup)) {
-    try {
-        fs.unlinkSync(baselineProfileBackup);
-        process.stdout.write(`🗑️ Removed file: ${baselineProfileBackup}\n`);
-    } catch (error) {
-        process.stderr.write(`⚠️ Failed to remove ${baselineProfileBackup}: ${error.message}\n`);
-    }
-}
-
-process.stdout.write("✅ Uninstall cleanup complete!\n");
+// Define file prefixes to delete
+const filePrefixes = [
+    "add-splash-screen",
+    "setSplashAnimation",
+    "codeplayBeforeBuild",
+    "finalrelease"
+];
+
+const fs = require("fs");
+const path = require("path");
+
+const projectRoot = path.resolve(__dirname, "../../../"); // Project root
+const commonBuildPath = path.join(__dirname, "../files"); // Path where files were copied from
+const splashXmlPath = path.join(projectRoot, "buildCodeplay"); // Path to splashxml folder
+const baselineProfileSetupScript = path.join(projectRoot, "scripts", "setup-baseline-profile.js");
+const baselineProfileBackup = path.join(projectRoot, "baselineProfiles", "baseline-prof.txt");
+
+const isAgentInstructionAsset = (file) => {
+    const normalizedName = file.toLowerCase();
+    return normalizedName === "agents" || normalizedName === "agents.md";
+};
+
+process.stdout.write("🚀 Uninstalling: Removing old and copied files...\n");
+
+const removeDirectory = (dirPath) => {
+    if (fs.existsSync(dirPath)) {
+        fs.readdirSync(dirPath).forEach(file => {
+            const currentPath = path.join(dirPath, file);
+            if (fs.lstatSync(currentPath).isDirectory()) {
+                removeDirectory(currentPath);
+            } else {
+                fs.unlinkSync(currentPath);
+            }
+        });
+        fs.rmdirSync(dirPath);
+        process.stdout.write(`🗑️ Removed folder: ${dirPath}\n`);
+    }
+};
+
+removeDirectory(splashXmlPath);
+removeDirectory(path.join(projectRoot, "splashxml")); // Remove old splashxml folder
+
+// Step 1: Find all matching files in the project directory
+const filePatternsToRemove = [
+    /^add-splash-screen-.*$/, 
+    /^setSplashAnimation-.*$/, 
+    /^codeplayBeforeBuild-.*$/, 
+    /^modify-plugin-xml\.xml$/, 
+    /^finalrelease.*$/, 
+    /^iap-install-\d+(\.\d+)?\.js$/,
+    /^\.env\.storeid[1-7]$/, 
+    /^modify-plugin-xml\.js$/
+];
+
+const filesInProject = fs.readdirSync(projectRoot);
+
+filesInProject.forEach(file => {
+    if (filePatternsToRemove.some(pattern => pattern.test(file))) {
+        const filePath = path.join(projectRoot, file);
+        try {
+            fs.unlinkSync(filePath);
+            process.stdout.write(`🗑️ Removed file: ${filePath}\n`);
+        } catch (error) {
+            process.stderr.write(`⚠️ Failed to remove ${filePath}: ${error.message}\n`);
+        }
+    }
+});
+
+// Remove files and folders listed in commonBuildPath
+if (fs.existsSync(commonBuildPath)) {
+    fs.readdirSync(commonBuildPath).forEach(file => {
+        const destPath = path.join(projectRoot, file);
+        if (file === "scripts" || isAgentInstructionAsset(file)) {
+            return;
+        }
+        if (fs.existsSync(destPath)) {
+            try {
+                if (fs.lstatSync(destPath).isDirectory()) {
+                    removeDirectory(destPath);
+                } else {
+                    fs.unlinkSync(destPath);
+                    process.stdout.write(`🗑️ Removed file: ${destPath}\n`);
+                }
+            } catch (error) {
+                process.stderr.write(`⚠️ Failed to remove ${destPath}: ${error.message}\n`);
+            }
+        }
+    });
+}
+
+if (fs.existsSync(baselineProfileSetupScript)) {
+    try {
+        fs.unlinkSync(baselineProfileSetupScript);
+        process.stdout.write(`🗑️ Removed file: ${baselineProfileSetupScript}\n`);
+    } catch (error) {
+        process.stderr.write(`⚠️ Failed to remove ${baselineProfileSetupScript}: ${error.message}\n`);
+    }
+}
+
+if (fs.existsSync(baselineProfileBackup)) {
+    try {
+        fs.unlinkSync(baselineProfileBackup);
+        process.stdout.write(`🗑️ Removed file: ${baselineProfileBackup}\n`);
+    } catch (error) {
+        process.stderr.write(`⚠️ Failed to remove ${baselineProfileBackup}: ${error.message}\n`);
+    }
+}
+
+process.stdout.write("✅ Uninstall cleanup complete!\n");