chore: update version to 5.1.5, enhance Minicap and Scrcpy integration with prebuilt packages, and clean up unused code

Author: UrielCh

.gitignore

@@ -8,4 +8,4 @@ package-lock.json
 *.log
 parcel.txt
 tasks/*encoder*/
-bench/.DS_Store
+**/.DS_Store

CHANGELOG.md

@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## V5.1.4 (2025-07-06)
+* use new prebuilt package
+
 ## V5.1.3 (2025-07-04)
 * fix import issue with protobufjs in nodeJS with nodeJS runtime
 

bin/scrcpy-server-v1.20.jar

@@ -1,6 +1,6 @@
 {
     "name": "@u4/adbkit",
-    "version": "5.1.3",
+    "version": "5.1.5",
     "description": "A Typescript client for the Android Debug Bridge.",
     "type": "module",
     "keywords": [
@@ -64,12 +64,11 @@
     "dependencies": {
         "@u4/adbkit-logcat": "2.1.2",
         "@u4/adbkit-monkey": "^1.0.5",
-        "@u4/minicap-prebuilt": "^1.0.0",
+        "@u4/minicap-prebuilt": "^1.1.2",
         "@xmldom/xmldom": "^0.9.8",
         "commander": "14.0.0",
         "debug": "~4.4.1",
         "get-port": "7.1.0",
-        "import-meta-resolve": "^4.1.0",
         "node-forge": "^1.3.1",
         "promise-duplex": "^8.0.0",
         "promise-readable": "^8.0.1",
@@ -108,8 +107,5 @@
     "files": [
         "dist",
         "bin"
-    ],
-    "optionalDependencies": {
-        "@devicefarmer/minicap-prebuilt": "^2.7.3"
-    }
+    ]
 }

bin/scrcpy-server-v1.24.jar

@@ -8,8 +8,8 @@ import PromiseDuplex from 'promise-duplex';
 import ThirdUtils from "../ThirdUtils.js";
 import Utils from '../../utils.js';
 import Stats from '../../sync/stats.js';
-import { resolve } from 'import-meta-resolve';
-
+// import { resolve } from 'import-meta-resolve';
+import prebuilds from "@u4/minicap-prebuilt";
 /**
  * Application binary interface known CPU
  */
@@ -32,21 +32,21 @@ interface IEmissions {
   disconnect: (cause: string) => void
 }
 // fs.ReadStream | 
-function getResource(path: string): string | null {
-  try {
-    return require.resolve(path);
-  } catch (e) {
-    try {
-      if (e instanceof Error && e.message.includes('require is not defined')) {
-        const url = resolve(path, import.meta.url);
-        return new URL(url).pathname;
-      }
-    } catch (e) {
-      return null;
-    }
-    return null;
-  }
-}
+// function getResource(path: string): string | null {
+//   try {
+//     return require.resolve(path);
+//   } catch (e) {
+//     try {
+//       if (e instanceof Error && e.message.includes('require is not defined')) {
+//         const url = resolve(path, import.meta.url);
+//         return new URL(url).pathname;
+//       }
+//     } catch (e) {
+//       return null;
+//     }
+//     return null;
+//   }
+// }
 
 export default class Minicap extends EventEmitter {
   private config: MinicapOptions;
@@ -148,21 +148,24 @@ export default class Minicap extends EventEmitter {
     const props = await this.client.getProperties();
     const abi = props['ro.product.cpu.abi'] as ABI_CPU;
     const sdkLevel = parseInt(props['ro.build.version.sdk']);
-    const minicapName = (sdkLevel >= 16) ? 'minicap' : 'minicap-nopie';
+    // const minicapName = (sdkLevel >= 16) ? 'minicap' : 'minicap-nopie';
 
     let binFile: string | null = null;
     let soFile: string | null = null;
 
 
-    binFile = getResource(`@devicefarmer/minicap-prebuilt/prebuilt/${abi}/bin/${minicapName}`);
+    binFile = prebuilds.getMinicapBin(abi, sdkLevel);//  getResource(`@devicefarmer/minicap-prebuilt/prebuilt/${abi}/bin/${minicapName}`);
     if (!binFile)
       throw Error(`minicap not found in @devicefarmer/minicap-prebuilt/prebuilt/${abi}/bin/ please install @devicefarmer/minicap-prebuilt to use minicap`);
-
-    if (sdkLevel === 32) {
-      soFile = getResource(`@u4/minicap-prebuilt/prebuilt/${abi}/lib/android-${sdkLevel}/minicap.so`);
-    } else {
-      soFile = getResource(`@devicefarmer/minicap-prebuilt/prebuilt/${abi}/lib/android-${sdkLevel}/minicap.so`);
+    if (!fs.existsSync(binFile)) {
+      throw Error(`minicap binary not found in ${binFile}, please install @devicefarmer/minicap-prebuilt to use minicap`);
     }
+    soFile = prebuilds.getMinicapSO(abi, sdkLevel);
+    // if (sdkLevel === 32) {
+    //   soFile = getResource(`@u4/minicap-prebuilt/prebuilt/${abi}/lib/android-${sdkLevel}/minicap.so`);
+    // } else {
+    //   soFile = getResource(`@devicefarmer/minicap-prebuilt/prebuilt/${abi}/lib/android-${sdkLevel}/minicap.so`);
+    // }
 
     if (!soFile) {
       throw Error(`minicap.so for your device check for @devicefarmer/minicap-prebuilt update that support android-${sdkLevel}, ${soFile} is missing`);

package.json

@@ -10,10 +10,11 @@ import { Duplex } from 'node:stream';
 import { type MotionEvent, MotionEventMap, OrientationMap, ControlMessageMap } from './ScrcpyConst.js';
 import { KeyCodes } from '../../keycode.js';
 import { BufWrite } from '../minicap/BufWrite.js';
-import ThirdUtils from '../ThirdUtils.js';
+// import ThirdUtils from '../ThirdUtils.js';
 import Stats from '../../sync/stats.js';
 import { parse_sequence_parameter_set } from './sps.js';
 import { Point, ScrcpyOptions, H264Configuration, VideoStreamFramePacket } from './ScrcpyModels.js';
+import prebuilds from "@u4/minicap-prebuilt";
 
 const debug = Utils.debug('adb:scrcpy');
 
@@ -312,7 +313,9 @@ export default class Scrcpy extends EventEmitter {
       return this;
     const jarDest = '/data/local/tmp/scrcpy-server.jar';
     // Transfer server...
-    const jar = ThirdUtils.getResourcePath(`scrcpy-server-v1.${this.config.version}.jar`);
+    const jar = prebuilds.getScrcpyJar(`1.${this.config.version}`);
+    // ThirdUtils.getResourcePath(`scrcpy-server-v1.${this.config.version}.jar`);
+
     const srcStat: fs.Stats | null = await fs.promises.stat(jar).catch(() => null);
     const dstStat: Stats | null = await this.client.stat(jarDest).catch(() => null);
     if (!srcStat)