@mcesystems/adb-kit 1.0.2 → 1.0.4

package/dist/index.js

@@ -167,9 +167,7 @@ var AdbDeviceKit = class {
    * @returns The adb client
    */
   async getClient() {
-    if (!this.hasUsbDebugging) {
-      this.waitForUsbDebugging(1e4);
-    }
+    await this.waitForUsbDebugging(1e4);
     return this.client;
   }
   async hasUsbDebugging() {
@@ -177,6 +175,9 @@ var AdbDeviceKit = class {
     return !!devices.find((device) => device.id === this.deviceId);
   }
   async waitForUsbDebugging(timeout = 12e4) {
+    if (await this.hasUsbDebugging()) {
+      return true;
+    }
     const tracker = await this.client.trackDevices();
     return new Promise((resolve, reject) => {
       const timeoutId = setTimeout(() => {
@@ -201,12 +202,16 @@ var AdbDeviceKit = class {
       });
     });
   }
-  async getDeviceId() {
+  getDeviceId() {
     return this.deviceId;
   }
-  async getPort() {
+  getPort() {
     return this.port;
   }
+  async getDeviceClient() {
+    await this.waitForUsbDebugging(1e4);
+    return this.device;
+  }
 };
 
 // src/logic/devicesMonitor.ts
@@ -258,7 +263,7 @@ var DevicesMonitor = class {
         return;
       }
       this.kits.delete(device.deviceId);
-      this.eventEmitter?.emit("removed", device.deviceId);
+      this.eventEmitter?.emit("removed", device.deviceId, device.logicalPort);
     });
     return this.eventEmitter;
   }

package/dist/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/logic/adbDeviceKit.ts", "../src/utils/adbPath.ts", "../src/utils/debug.ts", "../src/logic/devicesMonitor.ts"],
-  "sourcesContent": ["import { createRequire } from \"node:module\";\nimport type { Client as AdbClient, DeviceClient } from \"@devicefarmer/adbkit\";\nimport type { AdbDevice } from \"../types/adb\";\nimport { getAdbBinaryPath } from \"../utils/adbPath\";\nimport { logInfo, logTask } from \"../utils/debug\";\n\n\n/**\n * Ensures ADB_PATH environment variable is set to use adb from resources\n * @devicefarmer/adbkit uses ADB_PATH environment variable to locate the adb binary\n */\nconst require = createRequire(import.meta.url);\nconst adbkit = require(\"@devicefarmer/adbkit\");\n\nfunction ensureAdbPathFromResources(): void {\n\tconst adbPath = getAdbBinaryPath();\n\tif (adbPath && !process.env.ADB_PATH) {\n\t\tprocess.env.ADB_PATH = adbPath;\n\t\tlogInfo(`Using ADB from resources: ${adbPath}`);\n\t}\n}\n\nconst deviceProps = {\n\tManufacturer: \"ro.product.manufacturer\",\n\tName: \"ro.product.name\",\n\tModel: \"ro.product.model\",\n\t\"Android Version\": \"ro.build.version.release\",\n\tPlatform: \"ro.board.platform\",\n\tCPU: \"ro.product.cpu.abi\",\n\t\"CPU.abi2\": \"ro.product.cpu.abi2\",\n\tDescription: \"ro.build.description\",\n\tFingerprint: \"ro.build.fingerprint\",\n\tBrand: \"ro.product.brand\",\n\tDevice: \"ro.product.device\",\n\t\"GSM Flexversion\": \"ro.gsm.flexversion\",\n\t\"Locale Language\": \"ro.product.locale.language\",\n\t\"Locale Region\": \"ro.product.locale.region\",\n\t\"Wifi Channels\": \"ro.wifi.channels\",\n\t\"Board Platform\": \"ro.board.platform\",\n\t\"Product Board\": \"ro.product.board\",\n\t\"Display ID\": \"ro.build.display.id\",\n\t\"GSM IMEI\": \"gsm.baseband.imei\",\n\t\"Version Incremental\": \"ro.build.version.incremental\",\n\t\"Version SDK\": \"ro.build.version.sdk\",\n\t\"Version Codename\": \"ro.build.version.codename\",\n\t\"Version Release\": \"ro.build.version.release\",\n\t\"Build Date\": \"ro.build.date\",\n\t\"Build Type\": \"ro.build.type\",\n\t\"Build User\": \"ro.build.user\",\n};\n\nexport type DeviceProperty = keyof typeof deviceProps;\n\nexport class AdbDeviceKit {\n\tprivate client: AdbClient;\n\tprivate device: DeviceClient;\n\tprivate deviceId: string;\n\n\tconstructor(\n\t\tdeviceId: string,\n\t\tprivate readonly port: number\n\t) {\n\t\tensureAdbPathFromResources();\n\t\tthis.client = adbkit.default.createClient();\n\t\t// Extract only the last part of deviceId after the last backslash\n\t\tthis.deviceId = deviceId.split(\"\\\\\").pop() ?? deviceId;\n\t\tlogInfo(`Device ID: ${this.deviceId}`);\n\t\tthis.device = this.client.getDevice(this.deviceId);\n\t}\n\n\tpublic async listDevices() {\n\t\tconst devices = await this.client.listDevices();\n\t\treturn devices;\n\t}\n\n\tprivate async getProperty(adbDevice: DeviceClient, property: DeviceProperty) {\n\t\ttry {\n\t\t\tlogTask(`Getting property ${property} for device ${this.deviceId}`);\n\t\t\tconst stream = await adbDevice.shell(`getprop ${deviceProps[property]}`);\n\t\t\tlogTask(`Stream: ${stream}`);\n\t\t\t// Read all data from the stream\n\t\t\tconst chunks: Buffer[] = [];\n\t\t\tfor await (const chunk of stream) {\n\t\t\t\tchunks.push(chunk);\n\t\t\t}\n\t\t\t// Convert Buffer chunks to string and trim\n\t\t\treturn Buffer.concat(chunks).toString().trim();\n\t\t} catch {\n\t\t\treturn \"\";\n\t\t}\n\t}\n\n\tpublic async getAllDeviceProperties() {\n\t\tif (!(await this.hasUsbDebugging())) {\n\t\t\tthis.waitForUsbDebugging(10000);\n\t\t}\n\t\treturn this.device.getProperties();\n\t}\n\n\tpublic async getDeviceProperties(properties: DeviceProperty[]) {\n\t\tlogTask(`Getting properties ${properties.join(\", \")} for device ${this.deviceId}`);\n\t\tif (!(await this.hasUsbDebugging())) {\n\t\t\tthis.waitForUsbDebugging(10000);\n\t\t}\n\t\tconst propertiesValues = await Promise.all(\n\t\t\tproperties.map((property) => this.getProperty(this.device, property))\n\t\t);\n\t\treturn propertiesValues;\n\t}\n\n\tpublic async installApp(appPath: string) {\n\t\tlogTask(`Installing app ${appPath} on device ${this.deviceId}`);\n\t\tif (!(await this.hasUsbDebugging())) {\n\t\t\tthis.waitForUsbDebugging(10000);\n\t\t}\n\t\tawait this.device.install(appPath);\n\t}\n\n\tpublic async uninstallApp(packageName: string) {\n\t\tlogTask(`Uninstalling app ${packageName} on device ${this.deviceId}`);\n\t\tif (!(await this.hasUsbDebugging())) {\n\t\t\tthis.waitForUsbDebugging(10000);\n\t\t}\n\t\tawait this.device.uninstall(packageName);\n\t}\n\n\tpublic async isAppInstalled(packageName: string) {\n\t\tlogTask(`Checking if app ${packageName} is installed on device ${this.deviceId}`);\n\t\tif (!(await this.hasUsbDebugging())) {\n\t\t\tthis.waitForUsbDebugging(10000);\n\t\t}\n\t\treturn await this.device.isInstalled(packageName);\n\t}\n\n\t/**\n\t * Applications have life of their own, so we need to get the client to use it in other parts of the code.\n\t * @returns The adb client\n\t */\n\tpublic async getClient() {\n\t\tif (!this.hasUsbDebugging) {\n\t\t\tthis.waitForUsbDebugging(10000);\n\t\t}\n\t\treturn this.client;\n\t}\n\n\tpublic async hasUsbDebugging() {\n\t\tconst devices = await this.listDevices();\n\t\treturn !!devices.find((device: AdbDevice) => device.id === this.deviceId);\n\t}\n\n\tpublic async waitForUsbDebugging(timeout = 120000) {\n\t\tconst tracker = await this.client.trackDevices();\n\t\treturn new Promise((resolve, reject) => {\n\t\t\tconst timeoutId = setTimeout(() => {\n\t\t\t\treject(new Error(\"Timeout waiting for USB debugging\"));\n\t\t\t}, timeout);\n\n\t\t\ttracker.on(\"remove\", (_: AdbDevice) => {\n\t\t\t\tclearTimeout(timeoutId);\n\t\t\t});\n\n\t\t\ttracker.on(\"add\", (device: AdbDevice) => {\n\t\t\t\tif (device.type === \"device\") {\n\t\t\t\t\tclearTimeout(timeoutId);\n\t\t\t\t\tresolve(true);\n\t\t\t\t}\n\t\t\t});\n\n\t\t\ttracker.on(\"change\", (device: AdbDevice) => {\n\t\t\t\tif (device.type === \"device\") {\n\t\t\t\t\tclearTimeout(timeoutId);\n\t\t\t\t\tresolve(true);\n\t\t\t\t} else {\n\t\t\t\t\tresolve(false);\n\t\t\t\t}\n\t\t\t});\n\t\t});\n\t}\n\n\tpublic async getDeviceId() {\n\t\treturn this.deviceId;\n\t}\n\n\tpublic async getPort() {\n\t\treturn this.port;\n\t}\n}\n", "import { existsSync } from \"node:fs\";\nimport path from \"node:path\";\nimport { fileURLToPath } from \"node:url\";\n\n/**\n * Get the platform-specific directory name for ADB binaries\n */\nfunction getPlatformDir(): string {\n\tconst platform = process.platform;\n\tif (platform === \"win32\") {\n\t\treturn \"windows\";\n\t}\n\tif (platform === \"darwin\") {\n\t\treturn \"darwin\";\n\t}\n\tif (platform === \"linux\") {\n\t\treturn \"linux\";\n\t}\n\tthrow new Error(`Unsupported platform: ${platform}`);\n}\n\n/**\n * Get the platform-specific ADB binary filename\n */\nfunction getAdbBinaryName(): string {\n\tif (process.platform === \"win32\") {\n\t\treturn \"adb.exe\";\n\t}\n\treturn \"adb\";\n}\n\n/**\n * Resolve the path to the ADB binary\n *\n * This function looks for the ADB binary in the following order:\n * 1. In dist/resources/bin/{platform}/ (production/bundled)\n * 2. In resources/bin/{platform}/ (development)\n * 3. Falls back to system PATH\n *\n * @returns The absolute path to the ADB binary, or null if not found\n */\nexport function getAdbBinaryPath(): string | null {\n\tconst __filename = fileURLToPath(import.meta.url);\n\tconst __dirname = path.dirname(__filename);\n\n\t// Try to find the package root by going up from dist/utils/ or src/utils/\n\t// In production: dist/utils/adbPath.js -> dist -> package root\n\t// In development: src/utils/adbPath.ts -> src -> package root\n\tlet packageRoot: string;\n\tif (__dirname.includes(\"dist\")) {\n\t\tpackageRoot = path.resolve(__dirname, \"..\", \"..\");\n\t} else {\n\t\tpackageRoot = path.resolve(__dirname, \"..\", \"..\");\n\t}\n\n\tconst platformDir = getPlatformDir();\n\tconst binaryName = getAdbBinaryName();\n\n\t// Try dist/resources/bin/{platform}/ (production/bundled)\n\tconst distPath = path.join(packageRoot, \"dist\", \"resources\", \"bin\", platformDir, binaryName);\n\tif (existsSync(distPath)) {\n\t\treturn distPath;\n\t}\n\n\t// Try resources/bin/{platform}/ (development)\n\tconst devPath = path.join(packageRoot, \"resources\", \"bin\", platformDir, binaryName);\n\tif (existsSync(devPath)) {\n\t\treturn devPath;\n\t}\n\n\t// Not found in bundled resources\n\treturn null;\n}\n\n/**\n * Get the directory containing ADB binaries for the current platform\n *\n * @returns The absolute path to the ADB binaries directory, or null if not found\n */\nexport function getAdbBinDirectory(): string | null {\n\tconst __filename = fileURLToPath(import.meta.url);\n\tconst __dirname = path.dirname(__filename);\n\n\tlet packageRoot: string;\n\tif (__dirname.includes(\"dist\")) {\n\t\tpackageRoot = path.resolve(__dirname, \"..\", \"..\");\n\t} else {\n\t\tpackageRoot = path.resolve(__dirname, \"..\", \"..\");\n\t}\n\n\tconst platformDir = getPlatformDir();\n\n\t// Try dist/resources/bin/{platform}/ (production/bundled)\n\tconst distPath = path.join(packageRoot, \"dist\", \"resources\", \"bin\", platformDir);\n\tif (existsSync(distPath)) {\n\t\treturn distPath;\n\t}\n\n\t// Try resources/bin/{platform}/ (development)\n\tconst devPath = path.join(packageRoot, \"resources\", \"bin\", platformDir);\n\tif (existsSync(devPath)) {\n\t\treturn devPath;\n\t}\n\n\t// Not found\n\treturn null;\n}\n\n/**\n * Check if ADB binary is available in bundled resources\n *\n * @returns true if ADB binary is found in resources, false otherwise\n */\nexport function hasBundledAdb(): boolean {\n\treturn getAdbBinaryPath() !== null;\n}\n", "import debug from \"debug\";\n\n\nconst logTask = debug(\"adb-kit:task\");\nconst logInfo = debug(\"adb-kit:info\");\nconst logWarning = debug(\"adb-kit:warning\");\nconst logError = debug(\"adb-kit:error\");\n\nlogTask.color = \"40\"; // Green\nlogInfo.color = \"45\"; // Blue\nlogWarning.color = \"214\"; // Orange/Yellow\nlogError.color = \"160\"; // Red\n\nexport { logTask, logInfo, logWarning, logError };\n", "import EventEmitter from \"node:events\";\nimport { createRequire } from \"node:module\";\nimport type { AdbDevice } from \"@/types/adb\";\nimport { getAdbBinaryPath } from \"@/utils/adbPath\";\nimport { logInfo } from \"@/utils/debug\";\nimport type { Client as AdbClient } from \"@devicefarmer/adbkit\";\nimport usbDeviceListener from \"@mcesystems/usb-device-listener\";\nimport type { DeviceInfo, ListenerConfig } from \"@mcesystems/usb-device-listener\";\nimport { AdbDeviceKit } from \"./adbDeviceKit\";\n\nconst require = createRequire(import.meta.url);\nconst adbkit = require(\"@devicefarmer/adbkit\");\n\n\n/**\n * Ensures ADB_PATH environment variable is set to use adb from resources\n * @devicefarmer/adbkit uses ADB_PATH environment variable to locate the adb binary\n */\nfunction ensureAdbPathFromResources(): void {\n\tconst adbPath = getAdbBinaryPath();\n\tif (adbPath && !process.env.ADB_PATH) {\n\t\tprocess.env.ADB_PATH = adbPath;\n\t\tlogInfo(`Using ADB from resources: ${adbPath}`);\n\t}\n}\n\nexport class DevicesMonitor {\n\tprivate kits: Map<string, AdbDeviceKit> = new Map();\n\tprivate eventEmitter?: EventEmitter;\n\n\tconstructor(\n\t\tprivate config: ListenerConfig,\n\t\tprivate identifyAlreadyConnected = false\n\t) { }\n\n\tpublic async startTracking(): Promise<EventEmitter> {\n\t\tlogInfo(\"Starting devices monitor\");\n\t\tusbDeviceListener.startListening(this.config);\n\t\tthis.eventEmitter = new EventEmitter();\n\t\tif (this.identifyAlreadyConnected) {\n\t\t\tawait this.connectedDevices();\n\t\t\tfor (const kit of this.kits.values()) {\n\t\t\t\tsetTimeout(() => {\n\t\t\t\t\tthis.eventEmitter?.emit(\"added\", kit);\n\t\t\t\t}, 0);\n\t\t\t}\n\t\t}\n\n\t\tusbDeviceListener.onDeviceAdd((device) => {\n\t\t\tconsole.log(\"Device added:\", device.deviceId);\n\t\t\tif (!device.logicalPort) {\n\t\t\t\treturn;\n\t\t\t}\n\t\t\tconst existingKit = this.kits.get(device.deviceId);\n\t\t\tconst adbDeviceKit =\n\t\t\t\texistingKit ?? new AdbDeviceKit(device.deviceId, device.logicalPort);\n\t\t\tif (!existingKit) {\n\t\t\t\tthis.kits.set(device.deviceId, adbDeviceKit);\n\t\t\t}\n\t\t\tthis.eventEmitter?.emit(\"added\", adbDeviceKit);\n\t\t});\n\n\t\tusbDeviceListener.onDeviceRemove((device) => {\n\t\t\tif (!device.logicalPort) {\n\t\t\t\treturn;\n\t\t\t}\n\t\t\tthis.kits.delete(device.deviceId);\n\t\t\tthis.eventEmitter?.emit(\"removed\", device.deviceId);\n\t\t});\n\t\treturn this.eventEmitter;\n\t}\n\n\tpublic async stopTracking() {\n\t\tif (!this.eventEmitter) {\n\t\t\treturn;\n\t\t}\n\t\tthis.eventEmitter.removeAllListeners();\n\t\tthis.kits.clear();\n\t\tthis.eventEmitter = undefined;\n\t\tusbDeviceListener.stopListening();\n\t}\n\n\tprivate async connectedDevices() {\n\t\tensureAdbPathFromResources();\n\t\tconst client: AdbClient = adbkit.default.createClient();\n\t\tconst devicesIds = await client\n\t\t\t.listDevices()\n\t\t\t.filter((device: AdbDevice) => device.type === \"device\")\n\t\t\t.map((device: AdbDevice) => device.id);\n\t\tthis.kits = new Map(\n\t\t\tawait usbDeviceListener\n\t\t\t\t.listDevices()\n\t\t\t\t.map((device: DeviceInfo) => ({\n\t\t\t\t\tid: device.deviceId.split(\"\\\\\").pop() ?? \"\",\n\t\t\t\t\tport: device.logicalPort ?? 0,\n\t\t\t\t}))\n\t\t\t\t.filter((device) => devicesIds.includes(device.id))\n\t\t\t\t.map((device) => [device.id, new AdbDeviceKit(device.id, device.port)])\n\t\t);\n\n\t\treturn this.kits.values();\n\t}\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { createRequire } from \"node:module\";\nimport type { Client as AdbClient, DeviceClient } from \"@devicefarmer/adbkit\";\nimport type { AdbDevice } from \"../types/adb\";\nimport { getAdbBinaryPath } from \"../utils/adbPath\";\nimport { logInfo, logTask } from \"../utils/debug\";\n\n/**\n * Ensures ADB_PATH environment variable is set to use adb from resources\n * @devicefarmer/adbkit uses ADB_PATH environment variable to locate the adb binary\n */\nconst require = createRequire(import.meta.url);\nconst adbkit = require(\"@devicefarmer/adbkit\");\n\nfunction ensureAdbPathFromResources(): void {\n\tconst adbPath = getAdbBinaryPath();\n\tif (adbPath && !process.env.ADB_PATH) {\n\t\tprocess.env.ADB_PATH = adbPath;\n\t\tlogInfo(`Using ADB from resources: ${adbPath}`);\n\t}\n}\n\nconst deviceProps = {\n\tManufacturer: \"ro.product.manufacturer\",\n\tName: \"ro.product.name\",\n\tModel: \"ro.product.model\",\n\t\"Android Version\": \"ro.build.version.release\",\n\tPlatform: \"ro.board.platform\",\n\tCPU: \"ro.product.cpu.abi\",\n\t\"CPU.abi2\": \"ro.product.cpu.abi2\",\n\tDescription: \"ro.build.description\",\n\tFingerprint: \"ro.build.fingerprint\",\n\tBrand: \"ro.product.brand\",\n\tDevice: \"ro.product.device\",\n\t\"GSM Flexversion\": \"ro.gsm.flexversion\",\n\t\"Locale Language\": \"ro.product.locale.language\",\n\t\"Locale Region\": \"ro.product.locale.region\",\n\t\"Wifi Channels\": \"ro.wifi.channels\",\n\t\"Board Platform\": \"ro.board.platform\",\n\t\"Product Board\": \"ro.product.board\",\n\t\"Display ID\": \"ro.build.display.id\",\n\t\"GSM IMEI\": \"gsm.baseband.imei\",\n\t\"Version Incremental\": \"ro.build.version.incremental\",\n\t\"Version SDK\": \"ro.build.version.sdk\",\n\t\"Version Codename\": \"ro.build.version.codename\",\n\t\"Version Release\": \"ro.build.version.release\",\n\t\"Build Date\": \"ro.build.date\",\n\t\"Build Type\": \"ro.build.type\",\n\t\"Build User\": \"ro.build.user\",\n};\n\nexport type DeviceProperty = keyof typeof deviceProps;\n\nexport class AdbDeviceKit {\n\tprivate client: AdbClient;\n\tprivate device: DeviceClient;\n\tprivate deviceId: string;\n\n\tconstructor(\n\t\tdeviceId: string,\n\t\tprivate readonly port: number\n\t) {\n\t\tensureAdbPathFromResources();\n\t\tthis.client = adbkit.default.createClient();\n\t\t// Extract only the last part of deviceId after the last backslash\n\t\tthis.deviceId = deviceId.split(\"\\\\\").pop() ?? deviceId;\n\t\tlogInfo(`Device ID: ${this.deviceId}`);\n\t\tthis.device = this.client.getDevice(this.deviceId);\n\t}\n\n\tpublic async listDevices() {\n\t\tconst devices = await this.client.listDevices();\n\t\treturn devices;\n\t}\n\n\tprivate async getProperty(adbDevice: DeviceClient, property: DeviceProperty) {\n\t\ttry {\n\t\t\tlogTask(`Getting property ${property} for device ${this.deviceId}`);\n\t\t\tconst stream = await adbDevice.shell(`getprop ${deviceProps[property]}`);\n\t\t\tlogTask(`Stream: ${stream}`);\n\t\t\t// Read all data from the stream\n\t\t\tconst chunks: Buffer[] = [];\n\t\t\tfor await (const chunk of stream) {\n\t\t\t\tchunks.push(chunk);\n\t\t\t}\n\t\t\t// Convert Buffer chunks to string and trim\n\t\t\treturn Buffer.concat(chunks).toString().trim();\n\t\t} catch {\n\t\t\treturn \"\";\n\t\t}\n\t}\n\n\tpublic async getAllDeviceProperties() {\n\t\tif (!(await this.hasUsbDebugging())) {\n\t\t\tthis.waitForUsbDebugging(10000);\n\t\t}\n\t\treturn this.device.getProperties();\n\t}\n\n\tpublic async getDeviceProperties(properties: DeviceProperty[]) {\n\t\tlogTask(`Getting properties ${properties.join(\", \")} for device ${this.deviceId}`);\n\t\tif (!(await this.hasUsbDebugging())) {\n\t\t\tthis.waitForUsbDebugging(10000);\n\t\t}\n\t\tconst propertiesValues = await Promise.all(\n\t\t\tproperties.map((property) => this.getProperty(this.device, property))\n\t\t);\n\t\treturn propertiesValues;\n\t}\n\n\tpublic async installApp(appPath: string) {\n\t\tlogTask(`Installing app ${appPath} on device ${this.deviceId}`);\n\t\tif (!(await this.hasUsbDebugging())) {\n\t\t\tthis.waitForUsbDebugging(10000);\n\t\t}\n\t\tawait this.device.install(appPath);\n\t}\n\n\tpublic async uninstallApp(packageName: string) {\n\t\tlogTask(`Uninstalling app ${packageName} on device ${this.deviceId}`);\n\t\tif (!(await this.hasUsbDebugging())) {\n\t\t\tthis.waitForUsbDebugging(10000);\n\t\t}\n\t\tawait this.device.uninstall(packageName);\n\t}\n\n\tpublic async isAppInstalled(packageName: string) {\n\t\tlogTask(`Checking if app ${packageName} is installed on device ${this.deviceId}`);\n\t\tif (!(await this.hasUsbDebugging())) {\n\t\t\tthis.waitForUsbDebugging(10000);\n\t\t}\n\t\treturn await this.device.isInstalled(packageName);\n\t}\n\n\t/**\n\t * Applications have life of their own, so we need to get the client to use it in other parts of the code.\n\t * @returns The adb client\n\t */\n\tpublic async getClient() {\n\t\tawait this.waitForUsbDebugging(10000);\n\t\treturn this.client;\n\t}\n\n\tpublic async hasUsbDebugging() {\n\t\tconst devices = await this.listDevices();\n\t\treturn !!devices.find((device: AdbDevice) => device.id === this.deviceId);\n\t}\n\n\tpublic async waitForUsbDebugging(timeout = 120000) {\n\t\tif (await this.hasUsbDebugging()) {\n\t\t\treturn true;\n\t\t}\n\t\tconst tracker = await this.client.trackDevices();\n\t\treturn new Promise((resolve, reject) => {\n\t\t\tconst timeoutId = setTimeout(() => {\n\t\t\t\treject(new Error(\"Timeout waiting for USB debugging\"));\n\t\t\t}, timeout);\n\n\t\t\ttracker.on(\"remove\", (_: AdbDevice) => {\n\t\t\t\tclearTimeout(timeoutId);\n\t\t\t});\n\n\t\t\ttracker.on(\"add\", (device: AdbDevice) => {\n\t\t\t\tif (device.type === \"device\") {\n\t\t\t\t\tclearTimeout(timeoutId);\n\t\t\t\t\tresolve(true);\n\t\t\t\t}\n\t\t\t});\n\n\t\t\ttracker.on(\"change\", (device: AdbDevice) => {\n\t\t\t\tif (device.type === \"device\") {\n\t\t\t\t\tclearTimeout(timeoutId);\n\t\t\t\t\tresolve(true);\n\t\t\t\t} else {\n\t\t\t\t\tresolve(false);\n\t\t\t\t}\n\t\t\t});\n\t\t});\n\t}\n\n\tpublic getDeviceId() {\n\t\treturn this.deviceId;\n\t}\n\n\tpublic getPort() {\n\t\treturn this.port;\n\t}\n\n\tpublic async getDeviceClient() {\n\t\tawait this.waitForUsbDebugging(10000);\n\t\treturn this.device;\n\t}\n}\n", "import { existsSync } from \"node:fs\";\nimport path from \"node:path\";\nimport { fileURLToPath } from \"node:url\";\n\n/**\n * Get the platform-specific directory name for ADB binaries\n */\nfunction getPlatformDir(): string {\n\tconst platform = process.platform;\n\tif (platform === \"win32\") {\n\t\treturn \"windows\";\n\t}\n\tif (platform === \"darwin\") {\n\t\treturn \"darwin\";\n\t}\n\tif (platform === \"linux\") {\n\t\treturn \"linux\";\n\t}\n\tthrow new Error(`Unsupported platform: ${platform}`);\n}\n\n/**\n * Get the platform-specific ADB binary filename\n */\nfunction getAdbBinaryName(): string {\n\tif (process.platform === \"win32\") {\n\t\treturn \"adb.exe\";\n\t}\n\treturn \"adb\";\n}\n\n/**\n * Resolve the path to the ADB binary\n *\n * This function looks for the ADB binary in the following order:\n * 1. In dist/resources/bin/{platform}/ (production/bundled)\n * 2. In resources/bin/{platform}/ (development)\n * 3. Falls back to system PATH\n *\n * @returns The absolute path to the ADB binary, or null if not found\n */\nexport function getAdbBinaryPath(): string | null {\n\tconst __filename = fileURLToPath(import.meta.url);\n\tconst __dirname = path.dirname(__filename);\n\n\t// Try to find the package root by going up from dist/utils/ or src/utils/\n\t// In production: dist/utils/adbPath.js -> dist -> package root\n\t// In development: src/utils/adbPath.ts -> src -> package root\n\tlet packageRoot: string;\n\tif (__dirname.includes(\"dist\")) {\n\t\tpackageRoot = path.resolve(__dirname, \"..\", \"..\");\n\t} else {\n\t\tpackageRoot = path.resolve(__dirname, \"..\", \"..\");\n\t}\n\n\tconst platformDir = getPlatformDir();\n\tconst binaryName = getAdbBinaryName();\n\n\t// Try dist/resources/bin/{platform}/ (production/bundled)\n\tconst distPath = path.join(packageRoot, \"dist\", \"resources\", \"bin\", platformDir, binaryName);\n\tif (existsSync(distPath)) {\n\t\treturn distPath;\n\t}\n\n\t// Try resources/bin/{platform}/ (development)\n\tconst devPath = path.join(packageRoot, \"resources\", \"bin\", platformDir, binaryName);\n\tif (existsSync(devPath)) {\n\t\treturn devPath;\n\t}\n\n\t// Not found in bundled resources\n\treturn null;\n}\n\n/**\n * Get the directory containing ADB binaries for the current platform\n *\n * @returns The absolute path to the ADB binaries directory, or null if not found\n */\nexport function getAdbBinDirectory(): string | null {\n\tconst __filename = fileURLToPath(import.meta.url);\n\tconst __dirname = path.dirname(__filename);\n\n\tlet packageRoot: string;\n\tif (__dirname.includes(\"dist\")) {\n\t\tpackageRoot = path.resolve(__dirname, \"..\", \"..\");\n\t} else {\n\t\tpackageRoot = path.resolve(__dirname, \"..\", \"..\");\n\t}\n\n\tconst platformDir = getPlatformDir();\n\n\t// Try dist/resources/bin/{platform}/ (production/bundled)\n\tconst distPath = path.join(packageRoot, \"dist\", \"resources\", \"bin\", platformDir);\n\tif (existsSync(distPath)) {\n\t\treturn distPath;\n\t}\n\n\t// Try resources/bin/{platform}/ (development)\n\tconst devPath = path.join(packageRoot, \"resources\", \"bin\", platformDir);\n\tif (existsSync(devPath)) {\n\t\treturn devPath;\n\t}\n\n\t// Not found\n\treturn null;\n}\n\n/**\n * Check if ADB binary is available in bundled resources\n *\n * @returns true if ADB binary is found in resources, false otherwise\n */\nexport function hasBundledAdb(): boolean {\n\treturn getAdbBinaryPath() !== null;\n}\n", "import debug from \"debug\";\n\nconst logTask = debug(\"adb-kit:task\");\nconst logInfo = debug(\"adb-kit:info\");\nconst logWarning = debug(\"adb-kit:warning\");\nconst logError = debug(\"adb-kit:error\");\n\nlogTask.color = \"40\"; // Green\nlogInfo.color = \"45\"; // Blue\nlogWarning.color = \"214\"; // Orange/Yellow\nlogError.color = \"160\"; // Red\n\nexport { logTask, logInfo, logWarning, logError };\n", "import EventEmitter from \"node:events\";\nimport { createRequire } from \"node:module\";\nimport type { AdbDevice } from \"@/types/adb\";\nimport { getAdbBinaryPath } from \"@/utils/adbPath\";\nimport { logInfo } from \"@/utils/debug\";\nimport type { Client as AdbClient } from \"@devicefarmer/adbkit\";\nimport usbDeviceListener from \"@mcesystems/usb-device-listener\";\nimport type { DeviceInfo, ListenerConfig } from \"@mcesystems/usb-device-listener\";\nimport { AdbDeviceKit } from \"./adbDeviceKit\";\n\nconst require = createRequire(import.meta.url);\nconst adbkit = require(\"@devicefarmer/adbkit\");\n\n/**\n * Ensures ADB_PATH environment variable is set to use adb from resources\n * @devicefarmer/adbkit uses ADB_PATH environment variable to locate the adb binary\n */\nfunction ensureAdbPathFromResources(): void {\n\tconst adbPath = getAdbBinaryPath();\n\tif (adbPath && !process.env.ADB_PATH) {\n\t\tprocess.env.ADB_PATH = adbPath;\n\t\tlogInfo(`Using ADB from resources: ${adbPath}`);\n\t}\n}\n\nexport class DevicesMonitor {\n\tprivate kits: Map<string, AdbDeviceKit> = new Map();\n\tprivate eventEmitter?: EventEmitter;\n\n\tconstructor(\n\t\tprivate config: ListenerConfig,\n\t\tprivate identifyAlreadyConnected = false\n\t) { }\n\n\tpublic async startTracking(): Promise<EventEmitter> {\n\t\tlogInfo(\"Starting devices monitor\");\n\t\tusbDeviceListener.startListening(this.config);\n\t\tthis.eventEmitter = new EventEmitter();\n\t\tif (this.identifyAlreadyConnected) {\n\t\t\tawait this.connectedDevices();\n\t\t\tfor (const kit of this.kits.values()) {\n\t\t\t\tsetTimeout(() => {\n\t\t\t\t\tthis.eventEmitter?.emit(\"added\", kit);\n\t\t\t\t}, 0);\n\t\t\t}\n\t\t}\n\n\t\tusbDeviceListener.onDeviceAdd((device) => {\n\t\t\tconsole.log(\"Device added:\", device.deviceId);\n\t\t\tif (!device.logicalPort) {\n\t\t\t\treturn;\n\t\t\t}\n\t\t\tconst existingKit = this.kits.get(device.deviceId);\n\t\t\tconst adbDeviceKit = existingKit ?? new AdbDeviceKit(device.deviceId, device.logicalPort);\n\t\t\tif (!existingKit) {\n\t\t\t\tthis.kits.set(device.deviceId, adbDeviceKit);\n\t\t\t}\n\t\t\tthis.eventEmitter?.emit(\"added\", adbDeviceKit);\n\t\t});\n\n\t\tusbDeviceListener.onDeviceRemove((device) => {\n\t\t\tif (!device.logicalPort) {\n\t\t\t\treturn;\n\t\t\t}\n\t\t\tthis.kits.delete(device.deviceId);\n\t\t\tthis.eventEmitter?.emit(\"removed\", device.deviceId, device.logicalPort);\n\t\t});\n\t\treturn this.eventEmitter;\n\t}\n\n\tpublic async stopTracking() {\n\t\tif (!this.eventEmitter) {\n\t\t\treturn;\n\t\t}\n\t\tthis.eventEmitter.removeAllListeners();\n\t\tthis.kits.clear();\n\t\tthis.eventEmitter = undefined;\n\t\tusbDeviceListener.stopListening();\n\t}\n\n\tprivate async connectedDevices() {\n\t\tensureAdbPathFromResources();\n\t\tconst client: AdbClient = adbkit.default.createClient();\n\t\tconst devicesIds = await client\n\t\t\t.listDevices()\n\t\t\t.filter((device: AdbDevice) => device.type === \"device\")\n\t\t\t.map((device: AdbDevice) => device.id);\n\t\tthis.kits = new Map(\n\t\t\tawait usbDeviceListener\n\t\t\t\t.listDevices()\n\t\t\t\t.map((device: DeviceInfo) => ({\n\t\t\t\t\tid: device.deviceId.split(\"\\\\\").pop() ?? \"\",\n\t\t\t\t\tport: device.logicalPort ?? 0,\n\t\t\t\t}))\n\t\t\t\t.filter((device) => devicesIds.includes(device.id))\n\t\t\t\t.map((device) => [device.id, new AdbDeviceKit(device.id, device.port)])\n\t\t);\n\n\t\treturn this.kits.values();\n\t}\n}\n"],
+  "mappings": "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",
   "names": ["require", "createRequire", "require", "createRequire", "adbkit", "ensureAdbPathFromResources"]
 }

package/dist/types/logic/adbDeviceKit.d.ts

@@ -1,4 +1,4 @@
-import type { Client as AdbClient } from "@devicefarmer/adbkit";
+import type { Client as AdbClient, DeviceClient } from "@devicefarmer/adbkit";
 declare const deviceProps: {
     Manufacturer: string;
     Name: string;
@@ -48,8 +48,9 @@ export declare class AdbDeviceKit {
     getClient(): Promise<AdbClient>;
     hasUsbDebugging(): Promise<boolean>;
     waitForUsbDebugging(timeout?: number): Promise<unknown>;
-    getDeviceId(): Promise<string>;
-    getPort(): Promise<number>;
+    getDeviceId(): string;
+    getPort(): number;
+    getDeviceClient(): Promise<DeviceClient>;
 }
 export {};
 //# sourceMappingURL=adbDeviceKit.d.ts.map

package/dist/types/logic/adbDeviceKit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adbDeviceKit.d.ts","sourceRoot":"","sources":["../../../src/logic/adbDeviceKit.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,IAAI,SAAS,EAAgB,MAAM,sBAAsB,CAAC;AAqB9E,QAAA,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2BhB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,MAAM,OAAO,WAAW,CAAC;AAEtD,qBAAa,YAAY;IAOvB,OAAO,CAAC,QAAQ,CAAC,IAAI;IANtB,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,QAAQ,CAAS;gBAGxB,QAAQ,EAAE,MAAM,EACC,IAAI,EAAE,MAAM;IAUjB,WAAW;YAKV,WAAW;IAiBZ,sBAAsB;IAOtB,mBAAmB,CAAC,UAAU,EAAE,cAAc,EAAE;IAWhD,UAAU,CAAC,OAAO,EAAE,MAAM;IAQ1B,YAAY,CAAC,WAAW,EAAE,MAAM;IAQhC,cAAc,CAAC,WAAW,EAAE,MAAM;IAQ/C;;;OAGG;IACU,SAAS;IAOT,eAAe;IAKf,mBAAmB,CAAC,OAAO,SAAS;IA6BpC,WAAW;IAIX,OAAO;CAGpB"}
+{"version":3,"file":"adbDeviceKit.d.ts","sourceRoot":"","sources":["../../../src/logic/adbDeviceKit.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,IAAI,SAAS,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAoB9E,QAAA,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2BhB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,MAAM,OAAO,WAAW,CAAC;AAEtD,qBAAa,YAAY;IAOvB,OAAO,CAAC,QAAQ,CAAC,IAAI;IANtB,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,QAAQ,CAAS;gBAGxB,QAAQ,EAAE,MAAM,EACC,IAAI,EAAE,MAAM;IAUjB,WAAW;YAKV,WAAW;IAiBZ,sBAAsB;IAOtB,mBAAmB,CAAC,UAAU,EAAE,cAAc,EAAE;IAWhD,UAAU,CAAC,OAAO,EAAE,MAAM;IAQ1B,YAAY,CAAC,WAAW,EAAE,MAAM;IAQhC,cAAc,CAAC,WAAW,EAAE,MAAM;IAQ/C;;;OAGG;IACU,SAAS;IAKT,eAAe;IAKf,mBAAmB,CAAC,OAAO,SAAS;IAgC1C,WAAW;IAIX,OAAO;IAID,eAAe;CAI5B"}

package/dist/types/logic/devicesMonitor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"devicesMonitor.d.ts","sourceRoot":"","sources":["../../../src/logic/devicesMonitor.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,aAAa,CAAC;AAOvC,OAAO,KAAK,EAAc,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAmBlF,qBAAa,cAAc;IAKzB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,wBAAwB;IALjC,OAAO,CAAC,IAAI,CAAwC;IACpD,OAAO,CAAC,YAAY,CAAC,CAAe;gBAG3B,MAAM,EAAE,cAAc,EACtB,wBAAwB,UAAQ;IAG5B,aAAa,IAAI,OAAO,CAAC,YAAY,CAAC;IAqCtC,YAAY;YAUX,gBAAgB;CAoB9B"}
+{"version":3,"file":"devicesMonitor.d.ts","sourceRoot":"","sources":["../../../src/logic/devicesMonitor.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,aAAa,CAAC;AAOvC,OAAO,KAAK,EAAc,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAkBlF,qBAAa,cAAc;IAKzB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,wBAAwB;IALjC,OAAO,CAAC,IAAI,CAAwC;IACpD,OAAO,CAAC,YAAY,CAAC,CAAe;gBAG3B,MAAM,EAAE,cAAc,EACtB,wBAAwB,UAAQ;IAG5B,aAAa,IAAI,OAAO,CAAC,YAAY,CAAC;IAoCtC,YAAY;YAUX,gBAAgB;CAoB9B"}

package/dist/types/utils/debug.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"debug.d.ts","sourceRoot":"","sources":["../../../src/utils/debug.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,QAAA,MAAM,OAAO,gBAAwB,CAAC;AACtC,QAAA,MAAM,OAAO,gBAAwB,CAAC;AACtC,QAAA,MAAM,UAAU,gBAA2B,CAAC;AAC5C,QAAA,MAAM,QAAQ,gBAAyB,CAAC;AAOxC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC"}
+{"version":3,"file":"debug.d.ts","sourceRoot":"","sources":["../../../src/utils/debug.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,QAAA,MAAM,OAAO,gBAAwB,CAAC;AACtC,QAAA,MAAM,OAAO,gBAAwB,CAAC;AACtC,QAAA,MAAM,UAAU,gBAA2B,CAAC;AAC5C,QAAA,MAAM,QAAQ,gBAAyB,CAAC;AAOxC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mcesystems/adb-kit",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "ADB (Android Debug Bridge) toolkit for device management",
   "type": "module",
   "main": "dist/index.js",
@@ -29,7 +29,7 @@
   "dependencies": {
     "@devicefarmer/adbkit": "^3.3.8",
     "debug": "^4.4.3",
-    "@mcesystems/usb-device-listener": "1.0.2"
+    "@mcesystems/usb-device-listener": "1.0.4"
   },
   "devDependencies": {
     "@types/debug": "^4.1.12",