@mcesystems/adb-kit 1.0.87 → 1.0.91

package/dist/types/index.d.ts

@@ -1,6 +1,7 @@
 // Generated by dts-bundle-generator v9.5.1
 
 import { Client as AdbClient, DeviceClient } from '@devicefarmer/adbkit';
+import { EventEmitter } from 'node:events';
 
 declare const deviceProps: {
 	Manufacturer: string;
@@ -33,11 +34,12 @@ declare const deviceProps: {
 export type DeviceProperty = keyof typeof deviceProps;
 export declare class AdbDeviceKit {
 	private readonly port;
+	private readonly config?;
 	private client;
 	private device;
 	private deviceId;
 	private devicePort;
-	constructor(deviceId: string, port: number);
+	constructor(deviceId: string, port: number, config?: AdbClientConfig | undefined);
 	private connect;
 	listDevices(): Promise<Bluebird<adbkit.Device[]>>;
 	private getProperty;
@@ -58,12 +60,23 @@ export declare class AdbDeviceKit {
 	 * during tracking don't affect other operations.
 	 */
 	private createTrackingClient;
-	waitForUsbDebugging(timeout?: number, _numberOfAllowedAttempts?: number): Promise<boolean>;
+	private matchesDeviceId;
+	waitForUsbDebugging(timeout?: number, _numberOfAllowedAttempts?: number): {
+		promise: Promise<boolean>;
+		events: EventEmitter;
+	};
 	startPortForward(serviceName: string): Promise<number | null>;
 	getDeviceId(): string;
 	getPort(): number;
 	getDeviceClient(): Promise<DeviceClient>;
 }
+/**
+ * USB debugging wait event names.
+ * Use with EventEmitter.on/emit from waitForUsbDebugging().events.
+ */
+export declare const USB_DEBUGGING_EVENT_OFF = "usbDebuggingOff";
+export declare const USB_DEBUGGING_EVENT_NEEDS_ALWAYS_ALLOW = "usbDebuggingNeedsAlwaysAllow";
+export declare const USB_DEBUGGING_EVENT_AUTHORIZED = "usbDebuggingAuthorized";
 export declare const readAll: typeof import("@devicefarmer/adbkit/dist/src/adb/util").default.readAll;
 
 export {};

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@mcesystems/adb-kit",
-  "version": "1.0.87",
+  "version": "1.0.91",
   "description": "ADB (Android Debug Bridge) toolkit for device management",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/types/index.d.ts",
   "exports": {
     ".": {
+      "my-internal": "./src/index.ts",
       "types": "./dist/types/index.d.ts",
       "import": "./dist/index.mjs",
       "require": "./dist/index.js"
@@ -31,7 +32,7 @@
     "@devicefarmer/adbkit": "^3.3.8",
     "get-port": "^7.1.0",
     "tsx": "^4.21.0",
-    "@mcesystems/tool-debug-g4": "1.0.87"
+    "@mcesystems/tool-debug-g4": "1.0.91"
   },
   "devDependencies": {
     "@types/node": "^22.10.2",
@@ -58,6 +59,7 @@
     "pack": "npm pack",
     "test": "vitest run",
     "test:watch": "vitest",
-    "example:first-android-properties": "tsx src/examples/first-connected-android-properties.ts"
+    "example:first-android-properties": "tsx src/examples/first-connected-android-properties.ts",
+    "example:usb-debugging-playground": "tsx src/examples/usb-debugging-playground.ts"
   }
 }

package/scripts/export-resources.ts

@@ -29,17 +29,18 @@ import {
 } from "node:fs";
 import path from "node:path";
 import { promisify } from "node:util";
+import { createLoggers } from "@mcesystems/tool-debug-g4";
 
-import {
-	logDataObject,
+const {
+	logInfo,
 	logDetail,
 	logError,
-	logErrorObject,
-	logInfo,
-	logNamespace,
 	logWarning,
+	logDataObject,
+	setNamespace,
 	setLogLevel,
-} from "@mcesystems/tool-debug-g4";
+	logErrorObject,
+} = createLoggers("adb-kit");
 
 const execAsync = promisify(exec);
 
@@ -294,7 +295,7 @@ https://android.googlesource.com/platform/packages/modules/adb/
 async function main(): Promise<void> {
 	const args = process.argv.slice(2);
 
-	logNamespace("adb-resources");
+	setNamespace("adb-resources");
 
 	if (args.includes("-v") || args.includes("--verbose")) {
 		setLogLevel("debug");