feat(profiler): add stop app function in profiler

Author: GuillaumeEgret

packages/commands/test/src/bin.ts

@@ -1,13 +1,12 @@
 #!/usr/bin/env node
 
 import { Option, program } from "commander";
-import { execSync } from "child_process";
 import { TestCase } from ".";
 import { executeAsync } from "./executeAsync";
 import { applyLogLevelOption, logLevelOption } from "./commands/logLevelOption";
 import { PerformanceTester } from "./PerformanceTester";
 import { Logger } from "@perf-profiler/logger";
-import { killApp } from "@perf-profiler/ios-instruments/dist/utils/DeviceManager";
+import { profiler } from "@perf-profiler/profiler";
 
 program
   .command("test")
@@ -119,14 +118,7 @@ const runTest = async ({
   const testCase: TestCase = {
     beforeTest: async () => {
       if (!skipRestart) {
-        if (process.env.PLATFORM === "ios" || process.env.PLATFORM === "ios-instruments") {
-          killApp(bundleId);
-        } else {
-          // This is needed in case the e2e test script actually restarts the app
-          // So far this method of measuring only works if e2e test actually starts the app
-          execSync(`adb shell am force-stop ${bundleId}`);
-          await new Promise((resolve) => setTimeout(resolve, 3000));
-        }
+        await profiler.stopApp(bundleId);
       }
 
       if (beforeEachCommand) await executeAsync(beforeEachCommand);

packages/core/types/index.ts

@@ -84,4 +84,5 @@ export interface Profiler {
   installProfilerOnDevice: () => void;
   cleanup: () => void;
   getScreenRecorder: (videoPath: string) => ScreenRecorder | undefined;
+  stopApp: (bundleId: string) => Promise<void>;
 }

packages/platforms/android/src/index.ts

@@ -4,15 +4,21 @@ import { cleanup } from "./commands/shell";
 import { ScreenRecorder } from "./commands/ScreenRecorder";
 import { profiler } from "./commands/platforms/platformProfiler";
 import { Profiler } from "@perf-profiler/types";
+import { execSync } from "child_process";
 
 export { Measure } from "@perf-profiler/types";
 export { Measure as GfxInfoMeasure } from "./commands/gfxInfo/parseGfxInfo";
 export { waitFor } from "./utils/waitFor";
+export { executeAsync, executeCommand } from "./commands/shell";
 
 export class AndroidProfiler implements Profiler {
   pollPerformanceMeasures = pollPerformanceMeasures;
   detectCurrentBundleId = profiler.detectCurrentBundleId;
   installProfilerOnDevice = ensureCppProfilerIsInstalled;
   getScreenRecorder = (videoPath: string) => new ScreenRecorder(videoPath);
   cleanup = cleanup;
+  async stopApp(bundleId: string) {
+    execSync(`adb shell am force-stop ${bundleId}`);
+    await new Promise((resolve) => setTimeout(resolve, 3000));
+  }
 }

packages/platforms/ios-instruments/package.json

@@ -5,7 +5,7 @@
   "bin": {
     "flashlight-ios-poc": "./dist/launchIOS.js"
   },
-  "main": "index.js",
+  "main": "dist/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },

packages/platforms/ios-instruments/src/index.ts

@@ -0,0 +1 @@
+export { killApp } from "./utils/DeviceManager";

packages/platforms/ios/package.json

@@ -15,6 +15,7 @@
   "license": "MIT",
   "dependencies": {
     "@perf-profiler/types": "^0.6.0",
-    "@perf-profiler/logger": "^0.3.1"
+    "@perf-profiler/logger": "^0.3.1",
+    "@perf-profiler/ios-instruments": "^0.2.0"
   }
 }

packages/platforms/ios/src/index.ts

@@ -1,5 +1,6 @@
 import { Measure, Profiler, ProfilerPollingOptions, ScreenRecorder } from "@perf-profiler/types";
 import { ChildProcess, exec } from "child_process";
+import { killApp } from "@perf-profiler/ios-instruments";
 
 interface AppMonitorData {
   Pid: number;
@@ -98,4 +99,9 @@ export class IOSProfiler implements Profiler {
   cleanup: () => void = () => {
     // Do we need anything here?
   };
+
+  async stopApp(bundleId: string): Promise<void> {
+    killApp(bundleId);
+    return new Promise<void>((resolve) => resolve());
+  }
 }

tsconfig.json

@@ -15,9 +15,9 @@
     { "path": "./packages/core/logger" },
     { "path": "./packages/core/types" },
     { "path": "./packages/platforms/android" },
+    { "path": "./packages/platforms/ios-instruments" },
     { "path": "./packages/platforms/ios" },
     { "path": "./packages/platforms/profiler" },
-    { "path": "./packages/platforms/ios-instruments" },
     { "path": "./packages/plugins/appium-helper" },
     { "path": "./packages/commands/test" },
     { "path": "./packages/commands/tools" },