From 01e258c70d15315adb6b8f08bd8f62a29e656d33 Mon Sep 17 00:00:00 2001
From: "Namhyeon, Go" <gnh1201@gmail.com>
Date: Wed, 2 Mar 2022 03:53:51 +0900
Subject: [PATCH] Update noxplayer.adb.js

---
 lib/noxplayer.adb.js | 87 ++++++++++++++------------------------------
 1 file changed, 28 insertions(+), 59 deletions(-)

diff --git a/lib/noxplayer.adb.js b/lib/noxplayer.adb.js
index 6eb247b..9f3086a 100644
--- a/lib/noxplayer.adb.js
+++ b/lib/noxplayer.adb.js
@@ -1,71 +1,40 @@
 ////////////////////////////////////////////////////////////////////////
-// LDPlayer API
+// NoxPlayer API
 ///////////////////////////////////////////////////////////////////////
 
 var SHELL = require("lib/shell");
-var SYS = require("lib/system");
+var ADB = require("lib/adb");
 
-exports.VERSIONINFO = "NoxPlayer (noxplayer.js) version 0.1";
-exports.global = global;
-exports.require = global.require;
-
-exports.binPath = SYS.getEnvString("PROGRAMFILES(X86)") + "/Nox/bin/nox_adb.exe";
-
-exports.getDevices = function() {
-    var data = [];
-    var cmd = [
-        exports.binPath,
-        "devices"
-    ]
+function getProcessID(id) {
+    var row = id.split(':');
+    //var addr = row[0];
+    var port = row[1];
+    var cmd = "netstat -ano | findstr :" + port + " | findstr :0";
     var result = SHELL.exec(cmd);
-    var lines = result.split(/\r?\n/);
-    for(var i = 0; i < lines.length; i++) {
-        var row = lines[i].split(/\s+/);
-        
-        if(row.length == 2) {
-            data.push({
-                host: row[0],
-                type: row[1]
-            });
-        }
-    }
-
-    return data;
+    return result.substring(result.lastIndexOf(' '));
 };
 
-exports.getHostname = function(host) {
-	return SHELL.exec([
-		exports.binPath,
-		"-s",
-		host,
-		"shell",
-		"getprop",
-		"net.hostname"
-	]).trim();
-};
-
-exports.getPID = function(host) {
-	var row = host.split(':');
-	var addr = row[0];
-	var port = row[1];
-	var cmd = "netstat -ano | findstr :" + port + " | findstr :0";
-	var result = SHELL.exec(cmd);
-	return result.substring(result.lastIndexOf(' '));
-};
-
-exports.getList = function() {
-	var data = [];
-    var devices = exports.getDevices();
+function getList() {
+    var items = [];
+    var devices = ADB.create()
+        .setBinPath(SYS.getEnvString("PROGRAMFILES(X86)") + "/Nox/bin/nox_adb.exe")
+        .getDevices()
+    ;
 
     for(var i = 0; i < devices.length; i++) {
-		var hostname = exports.getHostname(devices[i].host);
-		var pid = exports.getPID(devices[i].host);
+        var hostname = devices[i].hostname;
+	var PID = parseInt(getProcessID(devices[i].id));
+        items.push({
+            hostname: hostname,
+            PID: PID
+        });
+    }
 
-		data.push({
-			hostname: hostname,
-			PID: parseInt(pid)
-		});
-	}
+    return items;
+}
 
-    return data;
-};
+exports.getList = getList;
+
+exports.VERSIONINFO = "NoxPlayer (noxplayer.js) version 0.2";
+exports.global = global;
+exports.require = global.require;