@appium/images-plugin 1.2.0 → 1.2.4
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/README.md +1 -3
- package/build/lib/compare.js +34 -39
- package/build/lib/finder.js +218 -233
- package/build/lib/image-element.js +103 -116
- package/build/lib/logger.js +3 -3
- package/build/lib/plugin.js +30 -91
- package/build/test/e2e/plugin-e2e-specs.js +29 -44
- package/build/test/unit/finder-specs.js +231 -306
- package/build/test/unit/image-element-specs.js +123 -168
- package/build/test/unit/plugin-specs.js +93 -143
- package/build/tsconfig.tsbuildinfo +1 -0
- package/lib/compare.js +12 -7
- package/lib/finder.js +2 -2
- package/lib/image-element.js +2 -2
- package/lib/logger.js +1 -1
- package/lib/plugin.js +3 -36
- package/package.json +10 -9
- package/build/test/unit/basic-specs.js +0 -16
package/build/lib/finder.js
CHANGED
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
4
|
};
|
|
@@ -15,14 +6,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
6
|
exports.DEFAULT_FIX_IMAGE_TEMPLATE_SCALE = exports.DEFAULT_SETTINGS = exports.MJSONWP_ELEMENT_KEY = exports.W3C_ELEMENT_KEY = void 0;
|
|
16
7
|
const lodash_1 = __importDefault(require("lodash"));
|
|
17
8
|
const lru_cache_1 = __importDefault(require("lru-cache"));
|
|
18
|
-
const
|
|
19
|
-
const
|
|
9
|
+
const support_1 = require("@appium/support");
|
|
10
|
+
const base_driver_1 = require("@appium/base-driver");
|
|
20
11
|
const image_element_1 = require("./image-element");
|
|
21
12
|
const compare_1 = require("./compare");
|
|
22
13
|
const logger_1 = __importDefault(require("./logger"));
|
|
23
14
|
const MJSONWP_ELEMENT_KEY = 'ELEMENT';
|
|
24
15
|
exports.MJSONWP_ELEMENT_KEY = MJSONWP_ELEMENT_KEY;
|
|
25
|
-
const W3C_ELEMENT_KEY =
|
|
16
|
+
const W3C_ELEMENT_KEY = support_1.util.W3C_WEB_ELEMENT_IDENTIFIER;
|
|
26
17
|
exports.W3C_ELEMENT_KEY = W3C_ELEMENT_KEY;
|
|
27
18
|
const DEFAULT_FIX_IMAGE_TEMPLATE_SCALE = 1;
|
|
28
19
|
exports.DEFAULT_FIX_IMAGE_TEMPLATE_SCALE = DEFAULT_FIX_IMAGE_TEMPLATE_SCALE;
|
|
@@ -110,91 +101,91 @@ class ImageElementFinder {
|
|
|
110
101
|
*
|
|
111
102
|
* @returns {WebElement} - WebDriver element with a special id prefix
|
|
112
103
|
*/
|
|
113
|
-
findByImage(b64Template, { shouldCheckStaleness = false, multiple = false, ignoreDefaultImageTemplateScale = false, }) {
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
else {
|
|
150
|
-
results.push(yield compare_1.compareImages(compare_1.MATCH_TEMPLATE_MODE, b64Screenshot, b64Template, comparisonOpts));
|
|
151
|
-
}
|
|
152
|
-
return true;
|
|
104
|
+
async findByImage(b64Template, { shouldCheckStaleness = false, multiple = false, ignoreDefaultImageTemplateScale = false, }) {
|
|
105
|
+
if (!this.driver) {
|
|
106
|
+
throw new Error(`Can't find without a driver!`);
|
|
107
|
+
}
|
|
108
|
+
const settings = Object.assign({}, DEFAULT_SETTINGS, this.driver.settings.getSettings());
|
|
109
|
+
const { imageMatchThreshold: threshold, imageMatchMethod, fixImageTemplateSize, fixImageTemplateScale, defaultImageTemplateScale, getMatchedImageResult: visualize } = settings;
|
|
110
|
+
logger_1.default.info(`Finding image element with match threshold ${threshold}`);
|
|
111
|
+
if (!this.driver.getWindowSize) {
|
|
112
|
+
throw new Error("This driver does not support the required 'getWindowSize' command");
|
|
113
|
+
}
|
|
114
|
+
const { width: screenWidth, height: screenHeight } = await this.driver.getWindowSize();
|
|
115
|
+
// someone might have sent in a template that's larger than the screen
|
|
116
|
+
// dimensions. If so let's check and cut it down to size since the algorithm
|
|
117
|
+
// will not work unless we do. But because it requires some potentially
|
|
118
|
+
// expensive commands, only do this if the user has requested it in settings.
|
|
119
|
+
if (fixImageTemplateSize) {
|
|
120
|
+
b64Template = await this.ensureTemplateSize(b64Template, screenWidth, screenHeight);
|
|
121
|
+
}
|
|
122
|
+
const results = [];
|
|
123
|
+
const condition = async () => {
|
|
124
|
+
try {
|
|
125
|
+
const { b64Screenshot, scale } = await this.getScreenshotForImageFind(screenWidth, screenHeight);
|
|
126
|
+
b64Template = await this.fixImageTemplateScale(b64Template, {
|
|
127
|
+
defaultImageTemplateScale, ignoreDefaultImageTemplateScale,
|
|
128
|
+
fixImageTemplateScale, ...scale
|
|
129
|
+
});
|
|
130
|
+
const comparisonOpts = {
|
|
131
|
+
threshold,
|
|
132
|
+
visualize,
|
|
133
|
+
multiple,
|
|
134
|
+
};
|
|
135
|
+
if (imageMatchMethod) {
|
|
136
|
+
comparisonOpts.method = imageMatchMethod;
|
|
137
|
+
}
|
|
138
|
+
if (multiple) {
|
|
139
|
+
results.push(...(await (0, compare_1.compareImages)(compare_1.MATCH_TEMPLATE_MODE, b64Screenshot, b64Template, comparisonOpts)));
|
|
153
140
|
}
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
// retry, so trap that and just return false to trigger the next round of
|
|
157
|
-
// implicitly waiting. For other errors, throw them to get out of the
|
|
158
|
-
// implicit wait loop
|
|
159
|
-
if (err.message.match(/Cannot find any occurrences/)) {
|
|
160
|
-
return false;
|
|
161
|
-
}
|
|
162
|
-
throw err;
|
|
141
|
+
else {
|
|
142
|
+
results.push(await (0, compare_1.compareImages)(compare_1.MATCH_TEMPLATE_MODE, b64Screenshot, b64Template, comparisonOpts));
|
|
163
143
|
}
|
|
164
|
-
|
|
165
|
-
try {
|
|
166
|
-
yield this.driver.implicitWaitForCondition(condition);
|
|
144
|
+
return true;
|
|
167
145
|
}
|
|
168
146
|
catch (err) {
|
|
169
|
-
//
|
|
170
|
-
//
|
|
171
|
-
//
|
|
172
|
-
//
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
if (!err.message.match(/Condition unmet/)) {
|
|
176
|
-
throw err;
|
|
147
|
+
// if compareImages fails, we'll get a specific error, but we should
|
|
148
|
+
// retry, so trap that and just return false to trigger the next round of
|
|
149
|
+
// implicitly waiting. For other errors, throw them to get out of the
|
|
150
|
+
// implicit wait loop
|
|
151
|
+
if (err.message.match(/Cannot find any occurrences/)) {
|
|
152
|
+
return false;
|
|
177
153
|
}
|
|
154
|
+
throw err;
|
|
178
155
|
}
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
156
|
+
};
|
|
157
|
+
try {
|
|
158
|
+
await this.driver.implicitWaitForCondition(condition);
|
|
159
|
+
}
|
|
160
|
+
catch (err) {
|
|
161
|
+
// this `implicitWaitForCondition` method will throw a 'Condition unmet'
|
|
162
|
+
// error if an element is not found eventually. In that case, we will
|
|
163
|
+
// handle the element not found response below. In the case where get some
|
|
164
|
+
// _other_ kind of error, it means something blew up totally apart from the
|
|
165
|
+
// implicit wait timeout. We should not mask that error and instead throw
|
|
166
|
+
// it straightaway
|
|
167
|
+
if (!err.message.match(/Condition unmet/)) {
|
|
168
|
+
throw err;
|
|
184
169
|
}
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
// if we're just checking staleness, return straightaway so we don't add
|
|
190
|
-
// a new element to the cache. shouldCheckStaleness does not support multiple
|
|
191
|
-
// elements, since it is a purely internal mechanism
|
|
192
|
-
if (shouldCheckStaleness) {
|
|
193
|
-
return elements[0];
|
|
170
|
+
}
|
|
171
|
+
if (lodash_1.default.isEmpty(results)) {
|
|
172
|
+
if (multiple) {
|
|
173
|
+
return [];
|
|
194
174
|
}
|
|
195
|
-
|
|
196
|
-
|
|
175
|
+
throw new base_driver_1.errors.NoSuchElementError();
|
|
176
|
+
}
|
|
177
|
+
const elements = results.map(({ rect, score, visualization }) => {
|
|
178
|
+
logger_1.default.info(`Image template matched: ${JSON.stringify(rect)}`);
|
|
179
|
+
return new image_element_1.ImageElement(b64Template, rect, score, visualization, this);
|
|
197
180
|
});
|
|
181
|
+
// if we're just checking staleness, return straightaway so we don't add
|
|
182
|
+
// a new element to the cache. shouldCheckStaleness does not support multiple
|
|
183
|
+
// elements, since it is a purely internal mechanism
|
|
184
|
+
if (shouldCheckStaleness) {
|
|
185
|
+
return elements[0];
|
|
186
|
+
}
|
|
187
|
+
const registeredElements = elements.map((imgEl) => this.registerImageElement(imgEl));
|
|
188
|
+
return multiple ? registeredElements : registeredElements[0];
|
|
198
189
|
}
|
|
199
190
|
/**
|
|
200
191
|
* Ensure that the image template sent in for a find is of a suitable size
|
|
@@ -205,21 +196,19 @@ class ImageElementFinder {
|
|
|
205
196
|
*
|
|
206
197
|
* @returns {string} base64-encoded image, potentially resized
|
|
207
198
|
*/
|
|
208
|
-
ensureTemplateSize(b64Template, screenWidth, screenHeight) {
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
return (yield imgObj.getBuffer(appium_support_1.imageUtil.MIME_PNG)).toString('base64');
|
|
222
|
-
});
|
|
199
|
+
async ensureTemplateSize(b64Template, screenWidth, screenHeight) {
|
|
200
|
+
let imgObj = await support_1.imageUtil.getJimpImage(b64Template);
|
|
201
|
+
let { width: tplWidth, height: tplHeight } = imgObj.bitmap;
|
|
202
|
+
logger_1.default.info(`Template image is ${tplWidth}x${tplHeight}. Screen size is ${screenWidth}x${screenHeight}`);
|
|
203
|
+
// if the template fits inside the screen dimensions, we're good
|
|
204
|
+
if (tplWidth <= screenWidth && tplHeight <= screenHeight) {
|
|
205
|
+
return b64Template;
|
|
206
|
+
}
|
|
207
|
+
logger_1.default.info(`Scaling template image from ${tplWidth}x${tplHeight} to match ` +
|
|
208
|
+
`screen at ${screenWidth}x${screenHeight}`);
|
|
209
|
+
// otherwise, scale it to fit inside the screen dimensions
|
|
210
|
+
imgObj = imgObj.scaleToFit(screenWidth, screenHeight);
|
|
211
|
+
return (await imgObj.getBuffer(support_1.imageUtil.MIME_PNG)).toString('base64');
|
|
223
212
|
}
|
|
224
213
|
/**
|
|
225
214
|
* @typedef {Object} Screenshot
|
|
@@ -239,95 +228,93 @@ class ImageElementFinder {
|
|
|
239
228
|
*
|
|
240
229
|
* @returns {Screenshot, ?ScreenshotScale} base64-encoded screenshot and ScreenshotScale
|
|
241
230
|
*/
|
|
242
|
-
getScreenshotForImageFind(screenWidth, screenHeight) {
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
return { b64Screenshot, scale };
|
|
330
|
-
});
|
|
231
|
+
async getScreenshotForImageFind(screenWidth, screenHeight) {
|
|
232
|
+
if (!this.driver.getScreenshot) {
|
|
233
|
+
throw new Error("This driver does not support the required 'getScreenshot' command");
|
|
234
|
+
}
|
|
235
|
+
const settings = Object.assign({}, DEFAULT_SETTINGS, this.driver.settings.getSettings());
|
|
236
|
+
const { fixImageFindScreenshotDims } = settings;
|
|
237
|
+
let b64Screenshot = await this.driver.getScreenshot();
|
|
238
|
+
// if the user has requested not to correct for aspect or size differences
|
|
239
|
+
// between the screenshot and the screen, just return the screenshot now
|
|
240
|
+
if (!fixImageFindScreenshotDims) {
|
|
241
|
+
logger_1.default.info(`Not verifying screenshot dimensions match screen`);
|
|
242
|
+
return { b64Screenshot };
|
|
243
|
+
}
|
|
244
|
+
if (screenWidth < 1 || screenHeight < 1) {
|
|
245
|
+
logger_1.default.warn(`The retrieved screen size ${screenWidth}x${screenHeight} does ` +
|
|
246
|
+
`not seem to be valid. No changes will be applied to the screenshot`);
|
|
247
|
+
return { b64Screenshot };
|
|
248
|
+
}
|
|
249
|
+
// otherwise, do some verification on the screenshot to make sure it matches
|
|
250
|
+
// the screen size and aspect ratio
|
|
251
|
+
logger_1.default.info('Verifying screenshot size and aspect ratio');
|
|
252
|
+
let imgObj = await support_1.imageUtil.getJimpImage(b64Screenshot);
|
|
253
|
+
let { width: shotWidth, height: shotHeight } = imgObj.bitmap;
|
|
254
|
+
if (shotWidth < 1 || shotHeight < 1) {
|
|
255
|
+
logger_1.default.warn(`The retrieved screenshot size ${shotWidth}x${shotHeight} does ` +
|
|
256
|
+
`not seem to be valid. No changes will be applied to the screenshot`);
|
|
257
|
+
return { b64Screenshot };
|
|
258
|
+
}
|
|
259
|
+
if (screenWidth === shotWidth && screenHeight === shotHeight) {
|
|
260
|
+
// the height and width of the screenshot and the device screen match, which
|
|
261
|
+
// means we should be safe when doing template matches
|
|
262
|
+
logger_1.default.info('Screenshot size matched screen size');
|
|
263
|
+
return { b64Screenshot };
|
|
264
|
+
}
|
|
265
|
+
// otherwise, if they don't match, it could spell problems for the accuracy
|
|
266
|
+
// of coordinates returned by the image match algorithm, since we match based
|
|
267
|
+
// on the screenshot coordinates not the device coordinates themselves. There
|
|
268
|
+
// are two potential types of mismatch: aspect ratio mismatch and scale
|
|
269
|
+
// mismatch. We need to detect and fix both
|
|
270
|
+
const scale = { xScale: 1.0, yScale: 1.0 };
|
|
271
|
+
const screenAR = screenWidth / screenHeight;
|
|
272
|
+
const shotAR = shotWidth / shotHeight;
|
|
273
|
+
if (Math.round(screenAR * FLOAT_PRECISION) === Math.round(shotAR * FLOAT_PRECISION)) {
|
|
274
|
+
logger_1.default.info(`Screenshot aspect ratio '${shotAR}' (${shotWidth}x${shotHeight}) matched ` +
|
|
275
|
+
`screen aspect ratio '${screenAR}' (${screenWidth}x${screenHeight})`);
|
|
276
|
+
}
|
|
277
|
+
else {
|
|
278
|
+
logger_1.default.warn(`When trying to find an element, determined that the screen ` +
|
|
279
|
+
`aspect ratio and screenshot aspect ratio are different. Screen ` +
|
|
280
|
+
`is ${screenWidth}x${screenHeight} whereas screenshot is ` +
|
|
281
|
+
`${shotWidth}x${shotHeight}.`);
|
|
282
|
+
// In the case where the x-scale and y-scale are different, we need to decide
|
|
283
|
+
// which one to respect, otherwise the screenshot and template will end up
|
|
284
|
+
// being resized in a way that changes its aspect ratio (distorts it). For example, let's say:
|
|
285
|
+
// this.getScreenshot(shotWidth, shotHeight) is 540x397,
|
|
286
|
+
// this.getDeviceSize(screenWidth, screenHeight) is 1080x1920.
|
|
287
|
+
// The ratio would then be {xScale: 0.5, yScale: 0.2}.
|
|
288
|
+
// In this case, we must should `yScale: 0.2` as scaleFactor, because
|
|
289
|
+
// if we select the xScale, the height will be bigger than real screenshot size
|
|
290
|
+
// which is used to image comparison by OpenCV as a base image.
|
|
291
|
+
// All of this is primarily useful when the screenshot is a horizontal slice taken out of the
|
|
292
|
+
// screen (for example not including top/bottom nav bars)
|
|
293
|
+
const xScale = (1.0 * shotWidth) / screenWidth;
|
|
294
|
+
const yScale = (1.0 * shotHeight) / screenHeight;
|
|
295
|
+
const scaleFactor = xScale >= yScale ? yScale : xScale;
|
|
296
|
+
logger_1.default.warn(`Resizing screenshot to ${shotWidth * scaleFactor}x${shotHeight * scaleFactor} to match ` +
|
|
297
|
+
`screen aspect ratio so that image element coordinates have a ` +
|
|
298
|
+
`greater chance of being correct.`);
|
|
299
|
+
imgObj = imgObj.resize(shotWidth * scaleFactor, shotHeight * scaleFactor);
|
|
300
|
+
scale.xScale *= scaleFactor;
|
|
301
|
+
scale.yScale *= scaleFactor;
|
|
302
|
+
shotWidth = imgObj.bitmap.width;
|
|
303
|
+
shotHeight = imgObj.bitmap.height;
|
|
304
|
+
}
|
|
305
|
+
// Resize based on the screen dimensions only if both width and height are mismatched
|
|
306
|
+
// since except for that, it might be a situation which is different window rect and
|
|
307
|
+
// screenshot size like `@driver.window_rect #=>x=0, y=0, width=1080, height=1794` and
|
|
308
|
+
// `"deviceScreenSize"=>"1080x1920"`
|
|
309
|
+
if (screenWidth !== shotWidth && screenHeight !== shotHeight) {
|
|
310
|
+
logger_1.default.info(`Scaling screenshot from ${shotWidth}x${shotHeight} to match ` +
|
|
311
|
+
`screen at ${screenWidth}x${screenHeight}`);
|
|
312
|
+
imgObj = imgObj.resize(screenWidth, screenHeight);
|
|
313
|
+
scale.xScale *= (1.0 * screenWidth) / shotWidth;
|
|
314
|
+
scale.yScale *= (1.0 * screenHeight) / shotHeight;
|
|
315
|
+
}
|
|
316
|
+
b64Screenshot = (await imgObj.getBuffer(support_1.imageUtil.MIME_PNG)).toString('base64');
|
|
317
|
+
return { b64Screenshot, scale };
|
|
331
318
|
}
|
|
332
319
|
/**
|
|
333
320
|
* @typedef {Object} ImageTemplateSettings
|
|
@@ -351,47 +338,45 @@ class ImageElementFinder {
|
|
|
351
338
|
*
|
|
352
339
|
* @returns {string} base64-encoded scaled template screenshot
|
|
353
340
|
*/
|
|
354
|
-
fixImageTemplateScale(b64Template, opts = {}) {
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
return (yield imgTempObj.getBuffer(appium_support_1.imageUtil.MIME_PNG)).toString('base64');
|
|
393
|
-
});
|
|
341
|
+
async fixImageTemplateScale(b64Template, opts = {}) {
|
|
342
|
+
if (!opts) {
|
|
343
|
+
return b64Template;
|
|
344
|
+
}
|
|
345
|
+
let { fixImageTemplateScale = false, defaultImageTemplateScale = image_element_1.DEFAULT_TEMPLATE_IMAGE_SCALE, ignoreDefaultImageTemplateScale = false, xScale = DEFAULT_FIX_IMAGE_TEMPLATE_SCALE, yScale = DEFAULT_FIX_IMAGE_TEMPLATE_SCALE } = opts;
|
|
346
|
+
if (ignoreDefaultImageTemplateScale) {
|
|
347
|
+
defaultImageTemplateScale = image_element_1.DEFAULT_TEMPLATE_IMAGE_SCALE;
|
|
348
|
+
}
|
|
349
|
+
// Default
|
|
350
|
+
if (defaultImageTemplateScale === image_element_1.DEFAULT_TEMPLATE_IMAGE_SCALE && !fixImageTemplateScale) {
|
|
351
|
+
return b64Template;
|
|
352
|
+
}
|
|
353
|
+
// Calculate xScale and yScale Appium should scale
|
|
354
|
+
if (fixImageTemplateScale) {
|
|
355
|
+
xScale *= defaultImageTemplateScale;
|
|
356
|
+
yScale *= defaultImageTemplateScale;
|
|
357
|
+
}
|
|
358
|
+
else {
|
|
359
|
+
xScale = yScale = 1 * defaultImageTemplateScale;
|
|
360
|
+
}
|
|
361
|
+
// xScale and yScale can be NaN if defaultImageTemplateScale is string, for example
|
|
362
|
+
if (!parseFloat(xScale) || !parseFloat(yScale)) {
|
|
363
|
+
return b64Template;
|
|
364
|
+
}
|
|
365
|
+
// Return if the scale is default, 1, value
|
|
366
|
+
if (Math.round(xScale * FLOAT_PRECISION) === Math.round(DEFAULT_FIX_IMAGE_TEMPLATE_SCALE * FLOAT_PRECISION)
|
|
367
|
+
&& Math.round(yScale * FLOAT_PRECISION === Math.round(DEFAULT_FIX_IMAGE_TEMPLATE_SCALE * FLOAT_PRECISION))) {
|
|
368
|
+
return b64Template;
|
|
369
|
+
}
|
|
370
|
+
let imgTempObj = await support_1.imageUtil.getJimpImage(b64Template);
|
|
371
|
+
let { width: baseTempWidth, height: baseTempHeigh } = imgTempObj.bitmap;
|
|
372
|
+
const scaledWidth = baseTempWidth * xScale;
|
|
373
|
+
const scaledHeight = baseTempHeigh * yScale;
|
|
374
|
+
logger_1.default.info(`Scaling template image from ${baseTempWidth}x${baseTempHeigh}` +
|
|
375
|
+
` to ${scaledWidth}x${scaledHeight}`);
|
|
376
|
+
logger_1.default.info(`The ratio is ${xScale} and ${yScale}`);
|
|
377
|
+
imgTempObj = await imgTempObj.resize(scaledWidth, scaledHeight);
|
|
378
|
+
return (await imgTempObj.getBuffer(support_1.imageUtil.MIME_PNG)).toString('base64');
|
|
394
379
|
}
|
|
395
380
|
}
|
|
396
381
|
exports.default = ImageElementFinder;
|
|
397
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"finder.js","sourceRoot":"","sources":["../../lib/finder.js"],"names":[],"mappings":"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"}
|
|
382
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"finder.js","sourceRoot":"","sources":["../../lib/finder.js"],"names":[],"mappings":"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"}
|