appium-adb 14.3.1 → 14.3.3

package/lib/tools/system-calls.ts

@@ -1,14 +1,14 @@
 import path from 'node:path';
-import {log} from '../logger.js';
+import {log} from '../logger';
 import B from 'bluebird';
 import {system, fs, util, tempDir, timing} from '@appium/support';
-import {DEFAULT_ADB_EXEC_TIMEOUT, getSdkRootFromEnv} from '../helpers.js';
+import {DEFAULT_ADB_EXEC_TIMEOUT, getSdkRootFromEnv} from '../helpers';
 import {exec, SubProcess} from 'teen_process';
 import type {ExecError, TeenProcessExecResult} from 'teen_process';
 import {retry, retryInterval, waitForCondition} from 'asyncbox';
 import _ from 'lodash';
 import * as semver from 'semver';
-import type {ADB} from '../adb.js';
+import type {ADB} from '../adb';
 import type {
   ConnectedDevicesOptions,
   Device,
@@ -19,7 +19,7 @@ import type {
   SpecialAdbExecOptions,
   TFullOutputOption,
   ExecResult,
-} from './types.js';
+} from './types';
 
 const DEFAULT_ADB_REBOOT_RETRIES = 90;
 const LINKER_WARNING_REGEXP = /^WARNING: linker.+$/m;
@@ -43,7 +43,15 @@ const MIN_DELAY_ADB_API_LEVEL = 28;
 const REQUIRED_SERVICES = ['activity', 'package', 'window'] as const;
 const MAX_SHELL_BUFFER_LENGTH = 1000;
 
-// Private methods (defined early as they're used by public methods)
+/**
+ * Retrieve full path to the given binary.
+ *
+ * @param binaryName - The name of the binary
+ * @returns The full path to the binary
+ */
+export async function getSdkBinaryPath(this: ADB, binaryName: string): Promise<string> {
+  return await this.getBinaryFromSdkRoot(binaryName);
+}
 
 /**
  * Retrieve full binary name for the current operating system.
@@ -93,18 +101,6 @@ async function getOpenSslForOs(): Promise<string> {
   }
 }
 
-// Public methods
-
-/**
- * Retrieve full path to the given binary.
- *
- * @param binaryName - The name of the binary
- * @returns The full path to the binary
- */
-export async function getSdkBinaryPath(this: ADB, binaryName: string): Promise<string> {
-  return await this.getBinaryFromSdkRoot(binaryName);
-}
-
 export const getBinaryNameForOS = _.memoize(_getBinaryNameForOS);
 
 /**

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "appium-adb",
-  "version": "14.3.1",
+  "version": "14.3.3",
   "description": "Android Debug Bridge interface",
-  "main": "./build/index.js",
+  "main": "./build/lib/index.js",
   "scripts": {
     "build": "tsc -b",
     "clean": "npm run build -- --clean",
@@ -39,10 +39,8 @@
     "singleQuote": true
   },
   "files": [
-    "index.ts",
     "keys",
     "lib",
-    "build/index.*",
     "build/lib",
     "CHANGELOG.md"
   ],
@@ -80,7 +78,7 @@
     "semantic-release": "^25.0.2",
     "sinon": "^21.0.0",
     "ts-node": "^10.9.1",
-    "typescript": "^5.4.2"
+    "typescript": "^6.0.2"
   },
-  "types": "./build/index.d.ts"
+  "types": "./build/lib/index.d.ts"
 }

package/build/index.d.ts

@@ -1,8 +0,0 @@
-export * from './lib/adb';
-export { getAndroidBinaryPath } from './lib/tools/system-calls';
-export { getSdkRootFromEnv } from './lib/helpers';
-export type * from './lib/tools/types';
-export type * from './lib/types';
-import { ADB } from './lib/adb';
-export default ADB;
-//# sourceMappingURL=index.d.ts.map

package/build/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,OAAO,EAAC,oBAAoB,EAAC,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAC,iBAAiB,EAAC,MAAM,eAAe,CAAC;AAChD,mBAAmB,mBAAmB,CAAC;AACvC,mBAAmB,aAAa,CAAC;AAEjC,OAAO,EAAC,GAAG,EAAC,MAAM,WAAW,CAAC;AAC9B,eAAe,GAAG,CAAC"}

package/build/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,4CAA0B;AAC1B,yDAA8D;AAAtD,oHAAA,oBAAoB,OAAA;AAC5B,yCAAgD;AAAxC,4GAAA,iBAAiB,OAAA;AAIzB,mCAA8B;AAC9B,kBAAe,SAAG,CAAC"}

package/index.ts

@@ -1,8 +0,0 @@
-export * from './lib/adb';
-export {getAndroidBinaryPath} from './lib/tools/system-calls';
-export {getSdkRootFromEnv} from './lib/helpers';
-export type * from './lib/tools/types';
-export type * from './lib/types';
-
-import {ADB} from './lib/adb';
-export default ADB;