fix:app profiling issue for android API 28 and adb initialisation error (#50)

Fix #49, Fix #47

Author: sudharsan-selvaraj

package-lock.json

@@ -8,7 +8,7 @@
     "sequelize:migrate": "sequelize-cli db:migrate",
     "sequelize:migrate:undo": "sequelize-cli db:migrate:undo",
     "clean:cache": "node ./scripts/cleanup-cache-dir.js",
-    "postinstall": "(node ./scripts/is-prod.js || tsc) && npm run clean:cache && npm run sequelize:migrate",
+    "postinstall": "(node ./scripts/is-prod.js || tsc) && npm run sequelize:migrate",
     "i": "tsc && (appium plugin uninstall appium-dashboard || exit 0) && appium plugin install --source=local $(pwd)",
     "start-appium": "appium --use-plugins=appium-dashboard --relaxed-security"
   },
@@ -29,6 +29,7 @@
   },
   "dependencies": {
     "@appium/base-plugin": "^1.8.0",
+    "@appium/support": "^2.55.4",
     "@ffmpeg-installer/ffmpeg": "^1.1.0",
     "appium-adb": "^9.0.0",
     "appium-base-driver": "^7.10.1",

package.json

@@ -24,13 +24,14 @@ Container.set("config", config);
 
 (async () => {
   //Create ADB instance
+  let adb = null;
   try {
-    Container.set("adb", await ADB.createADB({}));
-  } catch (ignore) {
-    pluginLogger.error("Unable to create adb instance");
-    pluginLogger.error(ignore);
+    adb = await ADB.createADB({});
+  } catch (err) {
+    pluginLogger.error("Unable to create adb instance.");
   }
 
+  Container.set("adb", adb);
   //Add FFMPEG to path
   process.env.PATH = process.env.PATH + ":" + ffmpeg.replace(/ffmpeg$/g, "");
 

src/index.ts

@@ -1,3 +1,3 @@
-import { logger } from "appium-support";
+import { logger } from "@appium/support";
 const pluginLogger = logger.getLogger("appium-dashboard");
 export { pluginLogger };

src/loggers/plugin-logger.ts

@@ -45,11 +45,15 @@ class AndroidAppProfiler extends EventEmitter {
         "%CPU,RSS,ARGS",
         "-s",
         "1",
-        "-m",
-        "20",
         "-d",
         "1",
       ];
+
+      /* -m argument is only suppoted after api level 28 */
+      if (_.isNumber(this.deviceInfo.api_level) && this.deviceInfo.api_level >= 28) {
+        cmd.push("-m", "20");
+      }
+
       this.proc = new SubProcess(this.adb.path, cmd);
       this.proc.on("exit", (code, signal) => {
         this.proc = null;
@@ -124,9 +128,17 @@ class AndroidAppProfiler extends EventEmitter {
     return {
       total_cpu: await this.getTotalCpus(),
       total_memory: await this.getTotalMemory(),
+      api_level: await this.getAndroidApiLevel(),
     };
   }
 
+  private async getAndroidApiLevel() {
+    //"-m","20",
+    const args = [...this.adb.defaultArgs, "-s", this.deviceUDID, "shell", "getprop", "ro.build.version.sdk"];
+    let out = await exec(this.adb.path, args);
+    return Number(out.stdout.trim());
+  }
+
   private async getTotalCpus() {
     const args = [...this.adb.defaultArgs, "-s", this.deviceUDID, "shell", "cat", "/proc/cpuinfo"];
     let out = await exec(this.adb.path, args);

src/plugin/app-profiler/android-app-profiler.ts

@@ -1 +1 @@
-declare module "appium-support";
+declare module "@appium/support";

typings/appium-support/index.d.ts

@@ -135,6 +135,7 @@ function getCpuChartData(
 
 /* Memory usage data */
 function getMemoryUsageChartOptions(session: Session) {
+  const totalMemoryInMB = toMegaByte(session.device_info.total_memory);
   return {
     responsive: true,
     plugins: {
@@ -146,7 +147,7 @@ function getMemoryUsageChartOptions(session: Session) {
       },
       title: {
         display: true,
-        text: "MEMORY",
+        text: `MEMORY [${totalMemoryInMB} MB]`,
       },
       tooltip: {
         callbacks: {
@@ -164,9 +165,7 @@ function getMemoryUsageChartOptions(session: Session) {
     scales: {
       y: {
         min: 0,
-        max:
-          Math.round(toMegaByte(session.device_info.total_memory) / 1000) *
-          1000,
+        max: Math.ceil(totalMemoryInMB / 500) * 500, //round to nearest five hundred
         ticks: {
           stepSize: 500,
         },