@appium/support 4.0.1 → 4.0.3
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.
- package/build/lib/image-util.d.ts +6 -3
- package/build/lib/image-util.d.ts.map +1 -1
- package/build/lib/image-util.js +21 -7
- package/build/lib/image-util.js.map +1 -1
- package/build/lib/mjpeg.js +2 -2
- package/build/lib/mjpeg.js.map +1 -1
- package/lib/image-util.js +21 -3
- package/lib/mjpeg.js +2 -2
- package/package.json +9 -7
|
@@ -1,11 +1,14 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @returns {import('sharp')}
|
|
3
|
+
*/
|
|
4
|
+
export function requireSharp(): typeof import("sharp");
|
|
1
5
|
/**
|
|
2
6
|
* Crop the image by given rectangle (use base64 string as input and output)
|
|
3
7
|
*
|
|
4
8
|
* @param {string} base64Image The string with base64 encoded image.
|
|
5
9
|
* Supports all image formats natively supported by Sharp library.
|
|
6
|
-
* @param {sharp.Region} rect The selected region of image
|
|
10
|
+
* @param {import('sharp').Region} rect The selected region of image
|
|
7
11
|
* @return {Promise<string>} base64 encoded string of cropped image
|
|
8
12
|
*/
|
|
9
|
-
export function cropBase64Image(base64Image: string, rect: sharp.Region): Promise<string>;
|
|
10
|
-
import sharp from "sharp";
|
|
13
|
+
export function cropBase64Image(base64Image: string, rect: import('sharp').Region): Promise<string>;
|
|
11
14
|
//# sourceMappingURL=image-util.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"image-util.d.ts","sourceRoot":"","sources":["../../lib/image-util.js"],"names":[],"mappings":"AAEA;;;;;;;GAOG;AACH,6CALW,MAAM,QAEN,
|
|
1
|
+
{"version":3,"file":"image-util.d.ts","sourceRoot":"","sources":["../../lib/image-util.js"],"names":[],"mappings":"AAEA;;GAEG;AACH,uDAaC;AAED;;;;;;;GAOG;AACH,6CALW,MAAM,QAEN,OAAO,OAAO,EAAE,MAAM,GACrB,QAAQ,MAAM,CAAC,CAK1B"}
|
package/build/lib/image-util.js
CHANGED
|
@@ -1,20 +1,34 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.cropBase64Image = void 0;
|
|
7
|
-
|
|
3
|
+
exports.cropBase64Image = exports.requireSharp = void 0;
|
|
4
|
+
let _sharp;
|
|
5
|
+
/**
|
|
6
|
+
* @returns {import('sharp')}
|
|
7
|
+
*/
|
|
8
|
+
function requireSharp() {
|
|
9
|
+
if (!_sharp) {
|
|
10
|
+
try {
|
|
11
|
+
_sharp = require('sharp');
|
|
12
|
+
}
|
|
13
|
+
catch (err) {
|
|
14
|
+
throw new Error(`Cannot load the 'sharp' module needed for images processing. ` +
|
|
15
|
+
`Consider visiting https://sharp.pixelplumbing.com/install ` +
|
|
16
|
+
`for troubleshooting. Original error: ${err.message}`);
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
return _sharp;
|
|
20
|
+
}
|
|
21
|
+
exports.requireSharp = requireSharp;
|
|
8
22
|
/**
|
|
9
23
|
* Crop the image by given rectangle (use base64 string as input and output)
|
|
10
24
|
*
|
|
11
25
|
* @param {string} base64Image The string with base64 encoded image.
|
|
12
26
|
* Supports all image formats natively supported by Sharp library.
|
|
13
|
-
* @param {sharp.Region} rect The selected region of image
|
|
27
|
+
* @param {import('sharp').Region} rect The selected region of image
|
|
14
28
|
* @return {Promise<string>} base64 encoded string of cropped image
|
|
15
29
|
*/
|
|
16
30
|
async function cropBase64Image(base64Image, rect) {
|
|
17
|
-
const buf = await (
|
|
31
|
+
const buf = await requireSharp()(Buffer.from(base64Image, 'base64')).extract(rect).toBuffer();
|
|
18
32
|
return buf.toString('base64');
|
|
19
33
|
}
|
|
20
34
|
exports.cropBase64Image = cropBase64Image;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"image-util.js","sourceRoot":"","sources":["../../lib/image-util.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"image-util.js","sourceRoot":"","sources":["../../lib/image-util.js"],"names":[],"mappings":";;;AAAA,IAAI,MAAM,CAAC;AAEX;;GAEG;AACH,SAAgB,YAAY;IAC1B,IAAI,CAAC,MAAM,EAAE;QACX,IAAI;YACF,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;SAC3B;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,IAAI,KAAK,CACb,+DAA+D;gBAC/D,4DAA4D;gBAC5D,wCAAwC,GAAG,CAAC,OAAO,EAAE,CACtD,CAAC;SACH;KACF;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAbD,oCAaC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,eAAe,CAAC,WAAW,EAAE,IAAI;IACrD,MAAM,GAAG,GAAG,MAAM,YAAY,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC9F,OAAO,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAChC,CAAC;AAHD,0CAGC"}
|
package/build/lib/mjpeg.js
CHANGED
|
@@ -7,7 +7,7 @@ exports.MJpegStream = void 0;
|
|
|
7
7
|
const lodash_1 = __importDefault(require("lodash"));
|
|
8
8
|
const logger_1 = __importDefault(require("./logger"));
|
|
9
9
|
const bluebird_1 = __importDefault(require("bluebird"));
|
|
10
|
-
const
|
|
10
|
+
const image_util_1 = require("./image-util");
|
|
11
11
|
const stream_1 = require("stream");
|
|
12
12
|
const node_1 = require("./node");
|
|
13
13
|
const axios_1 = __importDefault(require("axios"));
|
|
@@ -73,7 +73,7 @@ class MJpegStream extends stream_1.Writable {
|
|
|
73
73
|
return null;
|
|
74
74
|
}
|
|
75
75
|
try {
|
|
76
|
-
return await (0,
|
|
76
|
+
return await (0, image_util_1.requireSharp)()(lastChunk).png().toBuffer();
|
|
77
77
|
}
|
|
78
78
|
catch (e) {
|
|
79
79
|
return null;
|
package/build/lib/mjpeg.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mjpeg.js","sourceRoot":"","sources":["../../lib/mjpeg.js"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AACvB,sDAA2B;AAC3B,wDAAyB;AACzB,
|
|
1
|
+
{"version":3,"file":"mjpeg.js","sourceRoot":"","sources":["../../lib/mjpeg.js"],"names":[],"mappings":"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"}
|
package/lib/image-util.js
CHANGED
|
@@ -1,14 +1,32 @@
|
|
|
1
|
-
|
|
1
|
+
let _sharp;
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* @returns {import('sharp')}
|
|
5
|
+
*/
|
|
6
|
+
export function requireSharp() {
|
|
7
|
+
if (!_sharp) {
|
|
8
|
+
try {
|
|
9
|
+
_sharp = require('sharp');
|
|
10
|
+
} catch (err) {
|
|
11
|
+
throw new Error(
|
|
12
|
+
`Cannot load the 'sharp' module needed for images processing. ` +
|
|
13
|
+
`Consider visiting https://sharp.pixelplumbing.com/install ` +
|
|
14
|
+
`for troubleshooting. Original error: ${err.message}`
|
|
15
|
+
);
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
return _sharp;
|
|
19
|
+
}
|
|
2
20
|
|
|
3
21
|
/**
|
|
4
22
|
* Crop the image by given rectangle (use base64 string as input and output)
|
|
5
23
|
*
|
|
6
24
|
* @param {string} base64Image The string with base64 encoded image.
|
|
7
25
|
* Supports all image formats natively supported by Sharp library.
|
|
8
|
-
* @param {sharp.Region} rect The selected region of image
|
|
26
|
+
* @param {import('sharp').Region} rect The selected region of image
|
|
9
27
|
* @return {Promise<string>} base64 encoded string of cropped image
|
|
10
28
|
*/
|
|
11
29
|
export async function cropBase64Image(base64Image, rect) {
|
|
12
|
-
const buf = await
|
|
30
|
+
const buf = await requireSharp()(Buffer.from(base64Image, 'base64')).extract(rect).toBuffer();
|
|
13
31
|
return buf.toString('base64');
|
|
14
32
|
}
|
package/lib/mjpeg.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import _ from 'lodash';
|
|
2
2
|
import log from './logger';
|
|
3
3
|
import B from 'bluebird';
|
|
4
|
-
import
|
|
4
|
+
import {requireSharp} from './image-util';
|
|
5
5
|
import {Writable} from 'stream';
|
|
6
6
|
import {requirePackage} from './node';
|
|
7
7
|
import axios from 'axios';
|
|
@@ -77,7 +77,7 @@ class MJpegStream extends Writable {
|
|
|
77
77
|
}
|
|
78
78
|
|
|
79
79
|
try {
|
|
80
|
-
return await
|
|
80
|
+
return await requireSharp()(lastChunk).png().toBuffer();
|
|
81
81
|
} catch (e) {
|
|
82
82
|
return null;
|
|
83
83
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@appium/support",
|
|
3
|
-
"version": "4.0.
|
|
3
|
+
"version": "4.0.3",
|
|
4
4
|
"description": "Support libs used across appium packages",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"automation",
|
|
@@ -42,7 +42,7 @@
|
|
|
42
42
|
},
|
|
43
43
|
"dependencies": {
|
|
44
44
|
"@appium/tsconfig": "^0.3.0",
|
|
45
|
-
"@appium/types": "^0.
|
|
45
|
+
"@appium/types": "^0.12.0",
|
|
46
46
|
"@colors/colors": "1.5.0",
|
|
47
47
|
"@types/archiver": "5.3.2",
|
|
48
48
|
"@types/base64-stream": "1.0.2",
|
|
@@ -55,7 +55,7 @@
|
|
|
55
55
|
"@types/ncp": "2.0.5",
|
|
56
56
|
"@types/npmlog": "4.1.4",
|
|
57
57
|
"@types/pluralize": "0.0.29",
|
|
58
|
-
"@types/semver": "7.
|
|
58
|
+
"@types/semver": "7.5.0",
|
|
59
59
|
"@types/shell-quote": "1.7.1",
|
|
60
60
|
"@types/supports-color": "8.1.1",
|
|
61
61
|
"@types/teen_process": "2.0.0",
|
|
@@ -86,17 +86,19 @@
|
|
|
86
86
|
"read-pkg": "5.2.0",
|
|
87
87
|
"resolve-from": "5.0.0",
|
|
88
88
|
"sanitize-filename": "1.6.3",
|
|
89
|
-
"semver": "7.5.
|
|
90
|
-
"sharp": "0.32.1",
|
|
89
|
+
"semver": "7.5.1",
|
|
91
90
|
"shell-quote": "1.8.1",
|
|
92
91
|
"source-map-support": "0.5.21",
|
|
93
92
|
"supports-color": "8.1.1",
|
|
94
93
|
"teen_process": "2.0.2",
|
|
95
|
-
"type-fest": "3.
|
|
94
|
+
"type-fest": "3.11.1",
|
|
96
95
|
"uuid": "9.0.0",
|
|
97
96
|
"which": "3.0.1",
|
|
98
97
|
"yauzl": "2.10.0"
|
|
99
98
|
},
|
|
99
|
+
"optionalDependencies": {
|
|
100
|
+
"sharp": "0.32.1"
|
|
101
|
+
},
|
|
100
102
|
"engines": {
|
|
101
103
|
"node": "^14.17.0 || ^16.13.0 || >=18.0.0",
|
|
102
104
|
"npm": ">=8"
|
|
@@ -104,7 +106,7 @@
|
|
|
104
106
|
"publishConfig": {
|
|
105
107
|
"access": "public"
|
|
106
108
|
},
|
|
107
|
-
"gitHead": "
|
|
109
|
+
"gitHead": "af066eb5c3542338eec821b81d6aa4bcf2d81188",
|
|
108
110
|
"typedoc": {
|
|
109
111
|
"entryPoint": "./lib/index.js"
|
|
110
112
|
}
|