appium-android-driver 5.13.4 → 5.13.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/CHANGELOG.md +14 -0
  2. package/build/lib/commands/actions.d.ts +4 -5
  3. package/build/lib/commands/actions.d.ts.map +1 -1
  4. package/build/lib/commands/actions.js +6 -7
  5. package/build/lib/commands/actions.js.map +1 -1
  6. package/lib/commands/actions.js +7 -8
  7. package/package.json +2 -3
package/CHANGELOG.md CHANGED
@@ -1,3 +1,17 @@
1
+ ## [5.13.6](https://github.com/appium/appium-android-driver/compare/v5.13.5...v5.13.6) (2023-06-16)
2
+
3
+
4
+ ### Bug Fixes
5
+
6
+ * Return buffer instance without extra conversion ([#825](https://github.com/appium/appium-android-driver/issues/825)) ([795dda5](https://github.com/appium/appium-android-driver/commit/795dda5033578d8b3b1e363c5c28e7448d309a80))
7
+
8
+ ## [5.13.5](https://github.com/appium/appium-android-driver/compare/v5.13.4...v5.13.5) (2023-06-16)
9
+
10
+
11
+ ### Miscellaneous Chores
12
+
13
+ * Make sharp to an optional dependency ([#824](https://github.com/appium/appium-android-driver/issues/824)) ([598388b](https://github.com/appium/appium-android-driver/commit/598388be58ab4e5ece4f3606ce78cabddc1574bb))
14
+
1
15
  ## [5.13.4](https://github.com/appium/appium-android-driver/compare/v5.13.3...v5.13.4) (2023-06-15)
2
16
 
3
17
 
package/build/lib/commands/actions.d.ts CHANGED
@@ -195,15 +195,14 @@ export namespace helpers {
195
195
  /**
196
196
  * @param {ADB} adb
197
197
  * @param {Object} opts
198
- * @returns {Promise<sharp>}
198
+ * @returns {Promise<Buffer>}
199
199
  */
200
- function getScreenshotDataWithAdbShell(adb: ADB, opts: any): Promise<typeof sharp>;
200
+ function getScreenshotDataWithAdbShell(adb: ADB, opts: any): Promise<Buffer>;
201
201
  /**
202
202
  * @param {ADB} adb
203
- * @returns {Promise<sharp>}
203
+ * @returns {Promise<Buffer>}
204
204
  */
205
- function getScreenshotDataWithAdbExecOut(adb: ADB): Promise<typeof sharp>;
205
+ function getScreenshotDataWithAdbExecOut(adb: ADB): Promise<Buffer>;
206
206
  }
207
207
  declare const extensions: {};
208
- import sharp from "sharp";
209
208
  //# sourceMappingURL=actions.d.ts.map
package/build/lib/commands/actions.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"actions.d.ts","sourceRoot":"","sources":["../../../lib/commands/actions.js"],"names":[],"mappings":";;;;;;iBA0Lc,MAAM;;;;aACN,MAAM;;;;;;iBAuBN,MAAM;;;;YACN,6BAAuB;;;;;;cAuBvB,CAAC,GAAC,CAAC,GAAC,CAAC,GAAC,CAAC,GAAC,CAAC;;;WAuBT,QAAM;;;WAuBN,QAAM;;;;;;aAuBN,MAAM;;;WAuBN,2DAA2C;;;;;;;;;gBAkB3C,MAAM;;;;WACN,MAAM;;;IA1UpB,gEAIC;IAED,oEAEC;IAED,wEAEC;IAED,wCAMC;IAED,wDAOC;IAED,2DAEC;IAED,gGAGC;IAED,wHAeC;IAED,+CAMC;IAED,sIAQC;IAED,qIAGC;IAED,8GAMC;IAED,2IAOC;IAED,6CAMC;IAED,2CAYC;IAED,kCAEC;IAED,iCAEC;IAED,2CAEC;IAED,kEAEC;IAED,wDAKC;IAED;;;;;;;OAOG;IAEH;;;;;OAKG;IACH,sDAGC;IAED,gEAKC;IAED;;;;OAIG;IAEH;;;;;OAKG;IACH,6DAGC;IAED,+DAKC;IAED;;;;OAIG;IAEH;;;;;OAKG;IACH,6DAGC;IAED,sDAKC;IAED;;;OAGG;IAEH;;;;;OAKG;IACH,iEAGC;IAED,6CAKC;IAED;;;OAGG;IAEH;;;;;OAKG;IACH,+DAGC;IAED,4CAKC;IAED;;;OAGG;IAEH;;;;;OAKG;IACH,8DAGC;IAED,2DAKC;IAED;;;OAGG;IAEH;;;;;OAKG;IACH,yEAGC;IAED,wDAKC;IAED;;;OAGG;IAEH;;;;;OAKG;IACH,uEAGC;IAED;;;;;;;;;;;OAWG;IACH,+CAYC;IAkDD,uCAiCC;;;IAjFD;;;;OAIG;IACH,mFAmBC;IAED;;;OAGG;IACH,0EAgBC;;AA/YD,6BAAsB"}
1
+ {"version":3,"file":"actions.d.ts","sourceRoot":"","sources":["../../../lib/commands/actions.js"],"names":[],"mappings":";;;;;;iBAyLc,MAAM;;;;aACN,MAAM;;;;;;iBAuBN,MAAM;;;;YACN,6BAAuB;;;;;;cAuBvB,CAAC,GAAC,CAAC,GAAC,CAAC,GAAC,CAAC,GAAC,CAAC;;;WAuBT,QAAM;;;WAuBN,QAAM;;;;;;aAuBN,MAAM;;;WAuBN,2DAA2C;;;;;;;;;gBAkB3C,MAAM;;;;WACN,MAAM;;;IA1UpB,gEAIC;IAED,oEAEC;IAED,wEAEC;IAED,wCAMC;IAED,wDAOC;IAED,2DAEC;IAED,gGAGC;IAED,wHAeC;IAED,+CAMC;IAED,sIAQC;IAED,qIAGC;IAED,8GAMC;IAED,2IAOC;IAED,6CAMC;IAED,2CAYC;IAED,kCAEC;IAED,iCAEC;IAED,2CAEC;IAED,kEAEC;IAED,wDAKC;IAED;;;;;;;OAOG;IAEH;;;;;OAKG;IACH,sDAGC;IAED,gEAKC;IAED;;;;OAIG;IAEH;;;;;OAKG;IACH,6DAGC;IAED,+DAKC;IAED;;;;OAIG;IAEH;;;;;OAKG;IACH,6DAGC;IAED,sDAKC;IAED;;;OAGG;IAEH;;;;;OAKG;IACH,iEAGC;IAED,6CAKC;IAED;;;OAGG;IAEH;;;;;OAKG;IACH,+DAGC;IAED,4CAKC;IAED;;;OAGG;IAEH;;;;;OAKG;IACH,8DAGC;IAED,2DAKC;IAED;;;OAGG;IAEH;;;;;OAKG;IACH,yEAGC;IAED,wDAKC;IAED;;;OAGG;IAEH;;;;;OAKG;IACH,uEAGC;IAED;;;;;;;;;;;OAWG;IACH,+CAYC;IAkDD,uCAiCC;;;IAjFD;;;;OAIG;IACH,6EAmBC;IAED;;;OAGG;IACH,oEAgBC;;AA/YD,6BAAsB"}
package/build/lib/commands/actions.js CHANGED
@@ -8,7 +8,6 @@ const android_helpers_1 = __importDefault(require("../android-helpers"));
8
8
  const support_1 = require("@appium/support");
9
9
  const path_1 = __importDefault(require("path"));
10
10
  const bluebird_1 = __importDefault(require("bluebird"));
11
- const sharp_1 = __importDefault(require("sharp"));
12
11
  const teen_process_1 = require("teen_process");
13
12
  const utils_1 = require("../utils");
14
13
  const swipeStepsPerSec = 28;
@@ -329,7 +328,7 @@ commands.sensorSet = async function sensorSet(sensor = {}) {
329
328
  /**
330
329
  * @param {ADB} adb
331
330
  * @param {Object} opts
332
- * @returns {Promise<sharp>}
331
+ * @returns {Promise<Buffer>}
333
332
  */
334
333
  helpers.getScreenshotDataWithAdbShell = async function getScreenshotDataWithAdbShell(adb, opts) {
335
334
  const localFile = await support_1.tempDir.path({ prefix: 'appium', suffix: '.png' });
@@ -344,7 +343,7 @@ helpers.getScreenshotDataWithAdbShell = async function getScreenshotDataWithAdbS
344
343
  throw new Error('The size of the taken screenshot equals to zero.');
345
344
  }
346
345
  await adb.pull(png, localFile);
347
- return (0, sharp_1.default)(localFile);
346
+ return await support_1.fs.readFile(localFile);
348
347
  }
349
348
  finally {
350
349
  if (await support_1.fs.exists(localFile)) {
@@ -354,7 +353,7 @@ helpers.getScreenshotDataWithAdbShell = async function getScreenshotDataWithAdbS
354
353
  };
355
354
  /**
356
355
  * @param {ADB} adb
357
- * @returns {Promise<sharp>}
356
+ * @returns {Promise<Buffer>}
358
357
  */
359
358
  helpers.getScreenshotDataWithAdbExecOut = async function getScreenshotDataWithAdbExecOut(adb) {
360
359
  const { stdout, stderr, code } = await (0, teen_process_1.exec)(adb.executable.path, [...adb.executable.defaultArgs, 'exec-out', '/system/bin/screencap', '-p'], { encoding: 'binary', isBuffer: true });
@@ -366,7 +365,7 @@ helpers.getScreenshotDataWithAdbExecOut = async function getScreenshotDataWithAd
366
365
  if (!stdout.length) {
367
366
  throw new Error('Screenshot returned no data');
368
367
  }
369
- return (0, sharp_1.default)(stdout);
368
+ return stdout;
370
369
  };
371
370
  commands.getScreenshot = async function getScreenshot() {
372
371
  const apiLevel = await this.adb.getApiLevel();
@@ -397,13 +396,13 @@ commands.getScreenshot = async function getScreenshot() {
397
396
  // Android bug 8433742 - rotate screenshot if screen is rotated
398
397
  let screenOrientation = await this.adb.getScreenOrientation();
399
398
  try {
400
- image = image.rotate(-90 * screenOrientation);
399
+ image = await support_1.imageUtil.requireSharp()(image).rotate(-90 * screenOrientation).toBuffer();
401
400
  }
402
401
  catch (err) {
403
402
  this.log.warn(`Could not rotate screenshot due to error: ${err}`);
404
403
  }
405
404
  }
406
- return (await image.toBuffer()).toString('base64');
405
+ return image.toString('base64');
407
406
  };
408
407
  Object.assign(extensions, commands, helpers);
409
408
  exports.default = extensions;
package/build/lib/commands/actions.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"actions.js","sourceRoot":"","sources":["../../../lib/commands/actions.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"actions.js","sourceRoot":"","sources":["../../../lib/commands/actions.js"],"names":[],"mappings":"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"}
package/lib/commands/actions.js CHANGED
@@ -1,8 +1,7 @@
1
1
  import androidHelpers from '../android-helpers';
2
- import { fs, util, tempDir} from '@appium/support';
2
+ import { fs, util, tempDir, imageUtil } from '@appium/support';
3
3
  import path from 'path';
4
4
  import B from 'bluebird';
5
- import sharp from 'sharp';
6
5
  import { exec } from 'teen_process';
7
6
  import { requireArgs } from '../utils';
8
7
 
@@ -367,7 +366,7 @@ commands.sensorSet = async function sensorSet (sensor = {}) {
367
366
  /**
368
367
  * @param {ADB} adb
369
368
  * @param {Object} opts
370
- * @returns {Promise<sharp>}
369
+ * @returns {Promise<Buffer>}
371
370
  */
372
371
  helpers.getScreenshotDataWithAdbShell = async function getScreenshotDataWithAdbShell (adb, opts) {
373
372
  const localFile = await tempDir.path({prefix: 'appium', suffix: '.png'});
@@ -382,7 +381,7 @@ helpers.getScreenshotDataWithAdbShell = async function getScreenshotDataWithAdbS
382
381
  throw new Error('The size of the taken screenshot equals to zero.');
383
382
  }
384
383
  await adb.pull(png, localFile);
385
- return sharp(localFile);
384
+ return await fs.readFile(localFile);
386
385
  } finally {
387
386
  if (await fs.exists(localFile)) {
388
387
  await fs.unlink(localFile);
@@ -392,7 +391,7 @@ helpers.getScreenshotDataWithAdbShell = async function getScreenshotDataWithAdbS
392
391
 
393
392
  /**
394
393
  * @param {ADB} adb
395
- * @returns {Promise<sharp>}
394
+ * @returns {Promise<Buffer>}
396
395
  */
397
396
  helpers.getScreenshotDataWithAdbExecOut = async function getScreenshotDataWithAdbExecOut (adb) {
398
397
  const {stdout, stderr, code} = await exec(
@@ -409,7 +408,7 @@ helpers.getScreenshotDataWithAdbExecOut = async function getScreenshotDataWithAd
409
408
  throw new Error('Screenshot returned no data');
410
409
  }
411
410
 
412
- return sharp(stdout);
411
+ return stdout;
413
412
  };
414
413
 
415
414
  commands.getScreenshot = async function getScreenshot () {
@@ -439,12 +438,12 @@ commands.getScreenshot = async function getScreenshot () {
439
438
  // Android bug 8433742 - rotate screenshot if screen is rotated
440
439
  let screenOrientation = await this.adb.getScreenOrientation();
441
440
  try {
442
- image = image.rotate(-90 * screenOrientation);
441
+ image = await imageUtil.requireSharp()(image).rotate(-90 * screenOrientation).toBuffer();
443
442
  } catch (err) {
444
443
  this.log.warn(`Could not rotate screenshot due to error: ${err}`);
445
444
  }
446
445
  }
447
- return (await image.toBuffer()).toString('base64');
446
+ return image.toString('base64');
448
447
  };
449
448
 
450
449
  Object.assign(extensions, commands, helpers);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "appium-android-driver",
3
- "version": "5.13.4",
3
+ "version": "5.13.6",
4
4
  "description": "Android UiAutomator and Chrome support for Appium",
5
5
  "keywords": [
6
6
  "appium",
@@ -71,14 +71,13 @@
71
71
  "portscanner": "2.2.0",
72
72
  "semver": "^7.0.0",
73
73
  "shared-preferences-builder": "^0.x",
74
- "sharp": "^0.x",
75
74
  "source-map-support": "^0.x",
76
75
  "teen_process": "^2.0.0",
77
76
  "ws": "^8.0.0"
78
77
  },
79
78
  "devDependencies": {
80
79
  "@appium/eslint-config-appium": "^6.0.0",
81
- "@appium/support": "^4.0.0",
80
+ "@appium/support": "^4.0.1",
82
81
  "@appium/test-support": "^3.0.0",
83
82
  "@appium/tsconfig": "^0.3.0",
84
83
  "@appium/types": "^0.11.1",