@appium/images-plugin 4.2.4 → 4.2.5
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/compare.d.ts.map +1 -1
- package/build/lib/compare.js +1 -5
- package/build/lib/compare.js.map +1 -1
- package/build/lib/finder.d.ts.map +1 -1
- package/build/lib/finder.js +5 -6
- package/build/lib/finder.js.map +1 -1
- package/build/lib/image-element.d.ts.map +1 -1
- package/build/lib/image-element.js +3 -7
- package/build/lib/image-element.js.map +1 -1
- package/build/lib/plugin.d.ts.map +1 -1
- package/build/lib/plugin.js +3 -7
- package/build/lib/plugin.js.map +1 -1
- package/lib/compare.ts +1 -2
- package/lib/finder.ts +5 -6
- package/lib/image-element.ts +3 -4
- package/lib/plugin.ts +3 -4
- package/package.json +5 -6
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compare.d.ts","sourceRoot":"","sources":["../../lib/compare.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"compare.d.ts","sourceRoot":"","sources":["../../lib/compare.ts"],"names":[],"mappings":"AACA,OAAO,EAOL,KAAK,eAAe,EACpB,KAAK,iBAAiB,EACtB,KAAK,iBAAiB,EACvB,MAAM,gBAAgB,CAAC;AAExB,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,SAAS,CAAC;AAE9C;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAsB,aAAa,CACjC,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,GAAG,MAAM,EAC3B,WAAW,EAAE,MAAM,GAAG,MAAM,EAC5B,OAAO,GAAE,eAAe,GAAG,iBAAiB,GAAG,iBAAsB,GACpE,OAAO,CAAC,gBAAgB,CAAC,CAuC3B"}
|
package/build/lib/compare.js
CHANGED
|
@@ -1,10 +1,6 @@
|
|
|
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
3
|
exports.compareImages = compareImages;
|
|
7
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
8
4
|
const driver_1 = require("appium/driver");
|
|
9
5
|
const opencv_1 = require("@appium/opencv");
|
|
10
6
|
const constants_1 = require("./constants");
|
|
@@ -33,7 +29,7 @@ async function compareImages(mode, firstImage, secondImage, options = {}) {
|
|
|
33
29
|
const img1 = Buffer.isBuffer(firstImage) ? firstImage : Buffer.from(firstImage, 'base64');
|
|
34
30
|
const img2 = Buffer.isBuffer(secondImage) ? secondImage : Buffer.from(secondImage, 'base64');
|
|
35
31
|
let result;
|
|
36
|
-
switch (
|
|
32
|
+
switch (mode.toLowerCase()) {
|
|
37
33
|
case constants_1.MATCH_FEATURES_MODE.toLowerCase():
|
|
38
34
|
try {
|
|
39
35
|
result = await (0, opencv_1.getImagesMatches)(img1, img2, options);
|
package/build/lib/compare.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compare.js","sourceRoot":"","sources":["../../lib/compare.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"compare.js","sourceRoot":"","sources":["../../lib/compare.ts"],"names":[],"mappings":";;AAoCA,sCA4CC;AAhFD,0CAAqC;AACrC,2CAUwB;AACxB,2CAA0F;AAG1F;;;;;;;;;;;;;;;;;;;;GAoBG;AACI,KAAK,UAAU,aAAa,CACjC,IAAY,EACZ,UAA2B,EAC3B,WAA4B,EAC5B,UAAmE,EAAE;IAErE,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAC1F,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IAC7F,IAAI,MAA4D,CAAC;IACjE,QAAQ,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;QAC3B,KAAK,+BAAmB,CAAC,WAAW,EAAE;YACpC,IAAI,CAAC;gBACH,MAAM,GAAG,MAAM,IAAA,yBAAgB,EAAC,IAAI,EAAE,IAAI,EAAE,OAA0B,CAAC,CAAC;YAC1E,CAAC;YAAC,MAAM,CAAC;gBACP,4BAA4B;gBAC5B,MAAM,GAAG,EAAC,KAAK,EAAE,CAAC,EAAmB,CAAC;YACxC,CAAC;YACD,MAAM;QACR,KAAK,+BAAmB,CAAC,WAAW,EAAE;YACpC,MAAM,GAAG,MAAM,IAAA,4BAAmB,EAAC,IAAI,EAAE,IAAI,EAAE,OAA4B,CAAC,CAAC;YAC7E,MAAM;QACR,KAAK,+BAAmB,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;YACvC,MAAM,IAAI,GAAG,OAA4B,CAAC;YAC1C,4EAA4E;YAC5E,MAAM,GAAG,MAAM,IAAA,2BAAkB,EAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;YACpD,IAAI,IAAI,CAAC,QAAQ,IAAK,MAA2B,CAAC,QAAQ,EAAE,CAAC;gBAC3D,MAAM,eAAe,GAAI,MAA2B,CAAC,QAAQ,CAAC;gBAC9D,IAAI,eAAe,EAAE,CAAC;oBACpB,OAAO,eAAe,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;gBAC3D,CAAC;YACH,CAAC;YACD,MAAM;QACR,CAAC;QACD;YACE,MAAM,IAAI,eAAM,CAAC,oBAAoB,CACnC,IAAI,IAAI,uCAAuC;gBAC7C,QAAQ,IAAI,CAAC,SAAS,CAAC;oBACrB,+BAAmB;oBACnB,+BAAmB;oBACnB,+BAAmB;iBACpB,CAAC,uBAAuB,CAC5B,CAAC;IACN,CAAC;IACD,OAAO,4BAA4B,CAAC,MAAM,CAAC,CAAC;AAC9C,CAAC;AAED;;;;;;IAMI;AACJ,SAAS,4BAA4B,CACnC,OAAgD;IAEhD,OAAO,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC;QAC3C,CAAC,CAAC;YACE,GAAG,OAAO;YACV,aAAa,EAAE,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC;SACxD;QACH,CAAC,CAAC,OAAO,CAAC;AACd,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"finder.d.ts","sourceRoot":"","sources":["../../lib/finder.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"finder.d.ts","sourceRoot":"","sources":["../../lib/finder.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAU7C,OAAO,KAAK,EAAC,cAAc,EAAE,OAAO,EAAQ,IAAI,EAAC,MAAM,eAAe,CAAC;AACvE,OAAO,KAAK,EAEV,kBAAkB,EAClB,UAAU,EACV,eAAe,EACf,qBAAqB,EAEtB,MAAM,SAAS,CAAC;AA2BjB,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,WAAW,CAAiC;gBAExC,GAAG,GAAE,MAAwB;IAQzC,oBAAoB,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO;IAKlD,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAI1D,kBAAkB,IAAI,IAAI;IAI1B;;;;;;;;;OASG;IACG,WAAW,CACf,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,cAAc,EACtB,EACE,oBAA4B,EAC5B,QAAgB,EAChB,+BAAuC,EACvC,aAAoB,GACrB,GAAE,kBAAuB,GACzB,OAAO,CAAC,OAAO,GAAG,OAAO,EAAE,GAAG,YAAY,CAAC;IA8I9C;;;;;;;OAOG;IACG,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC;IA8B1E;;;;;;;;OAQG;IACG,yBAAyB,CAC7B,MAAM,EAAE,cAAc,EACtB,UAAU,EAAE,IAAI,GACf,OAAO,CAAC,UAAU,GAAG;QAAC,KAAK,CAAC,EAAE,eAAe,CAAA;KAAC,CAAC;IA+HlD;;;;;;;;OAQG;IACG,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;CAsE7F"}
|
package/build/lib/finder.js
CHANGED
|
@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.ImageElementFinder = void 0;
|
|
7
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
8
7
|
const lru_cache_1 = require("lru-cache");
|
|
9
8
|
const driver_1 = require("appium/driver");
|
|
10
9
|
const image_element_1 = require("./image-element");
|
|
@@ -65,7 +64,7 @@ class ImageElementFinder {
|
|
|
65
64
|
const settings = { ...constants_1.DEFAULT_SETTINGS, ...driver.settings.getSettings() };
|
|
66
65
|
const { imageMatchThreshold: threshold, imageMatchMethod, fixImageTemplateSize, fixImageTemplateScale, defaultImageTemplateScale, getMatchedImageResult: visualize, } = settings;
|
|
67
66
|
logger_1.log.info(`Finding image element with match threshold ${threshold}`);
|
|
68
|
-
if (!driver.getWindowRect && !
|
|
67
|
+
if (!driver.getWindowRect && !Object.hasOwn(driver, 'getWindowSize')) {
|
|
69
68
|
throw new Error("This driver does not support the required 'getWindowRect' command");
|
|
70
69
|
}
|
|
71
70
|
let screenSize;
|
|
@@ -130,7 +129,7 @@ class ImageElementFinder {
|
|
|
130
129
|
return true;
|
|
131
130
|
};
|
|
132
131
|
const elOrEls = await (0, compare_1.compareImages)(constants_1.MATCH_TEMPLATE_MODE, screenshot, template, comparisonOpts);
|
|
133
|
-
return
|
|
132
|
+
return (Array.isArray(elOrEls) ? elOrEls : [elOrEls]).some(pushIfOk);
|
|
134
133
|
}
|
|
135
134
|
catch (err) {
|
|
136
135
|
// if compareImages fails, we'll get a specific error, but we should
|
|
@@ -157,7 +156,7 @@ class ImageElementFinder {
|
|
|
157
156
|
throw err;
|
|
158
157
|
}
|
|
159
158
|
}
|
|
160
|
-
if (
|
|
159
|
+
if (results.length === 0) {
|
|
161
160
|
if (multiple) {
|
|
162
161
|
return [];
|
|
163
162
|
}
|
|
@@ -194,7 +193,7 @@ class ImageElementFinder {
|
|
|
194
193
|
async ensureTemplateSize(template, maxSize) {
|
|
195
194
|
const imgObj = (0, sharp_1.default)(template);
|
|
196
195
|
const { width: tplWidth, height: tplHeight } = await imgObj.metadata();
|
|
197
|
-
if (
|
|
196
|
+
if (tplWidth == null || tplHeight == null) {
|
|
198
197
|
throw new Error(`Template width/height cannot be determined. Is it a valid image?`);
|
|
199
198
|
}
|
|
200
199
|
logger_1.log.info(`Template image is ${tplWidth}x${tplHeight}. Bounding rectangle size is ${maxSize.width}x${maxSize.height}`);
|
|
@@ -365,7 +364,7 @@ class ImageElementFinder {
|
|
|
365
364
|
}
|
|
366
365
|
let imgObj = (0, sharp_1.default)(template);
|
|
367
366
|
const { width: baseTempWidth, height: baseTempHeigh } = await imgObj.metadata();
|
|
368
|
-
if (
|
|
367
|
+
if (baseTempWidth == null || baseTempHeigh == null) {
|
|
369
368
|
throw new Error(`Template width/height cannot be determined. Is it a valid image?`);
|
|
370
369
|
}
|
|
371
370
|
const scaledWidth = baseTempWidth * xScale;
|
package/build/lib/finder.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"finder.js","sourceRoot":"","sources":["../../lib/finder.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"finder.js","sourceRoot":"","sources":["../../lib/finder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"image-element.d.ts","sourceRoot":"","sources":["../../lib/image-element.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"image-element.d.ts","sourceRoot":"","sources":["../../lib/image-element.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAC,IAAI,EAAE,OAAO,EAAE,cAAc,EAAiB,MAAM,eAAe,CAAC;AACjF,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,UAAU,CAAC;AACjD,OAAO,KAAK,EAAgB,SAAS,EAAE,QAAQ,EAAE,gBAAgB,EAAC,MAAM,SAAS,CAAC;AAIlF;;;GAGG;AACH,qBAAa,YAAY;IACvB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,IAAI,EAAE,IAAI,CAAC;IACX,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,MAAM,EAAE,kBAAkB,GAAG,IAAI,CAAC;IAC3C,QAAQ,CAAC,aAAa,EAAE,IAAI,GAAG,IAAI,CAAC;gBAExB,EACV,QAAQ,EACR,IAAI,EACJ,KAAK,EACL,KAAY,EACZ,MAAa,EACb,aAAoB,GACrB,EAAE,gBAAgB;IAUnB;;OAEG;IACH,IAAI,IAAI,IAAI,SAAS,CAEpB;IAED;;OAEG;IACH,IAAI,QAAQ,IAAI,QAAQ,CAEvB;IAED;;OAEG;IACH,IAAI,MAAM,IAAI,QAAQ,CAKrB;IAED;;OAEG;IACH,IAAI,aAAa,IAAI,MAAM,CAE1B;IAED;;OAEG;IACH,IAAI,YAAY,IAAI,MAAM,GAAG,IAAI,CAEhC;IAED;;;;;;;;;OASG;WACU,OAAO,CAAC,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAoC5G;;;OAGG;IACH,SAAS,IAAI,OAAO;IAIpB;;;;OAIG;IACH,MAAM,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO;IASpC;;;;;OAKG;IACG,KAAK,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAwGlD;;;;;;;OAOG;IACG,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,OAAO,GAAG,OAAO,EAAE,GAAG,YAAY,CAAC;CAcnH"}
|
|
@@ -1,10 +1,6 @@
|
|
|
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
3
|
exports.ImageElement = void 0;
|
|
7
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
8
4
|
const driver_1 = require("appium/driver");
|
|
9
5
|
const support_1 = require("@appium/support");
|
|
10
6
|
const logger_1 = require("./logger");
|
|
@@ -169,7 +165,7 @@ class ImageElement {
|
|
|
169
165
|
`${JSON.stringify(this.rect)}.`);
|
|
170
166
|
if (updatePos) {
|
|
171
167
|
logger_1.log.warn('Click will proceed at new coordinates');
|
|
172
|
-
this.rect =
|
|
168
|
+
this.rect = { ...newImgEl.rect };
|
|
173
169
|
}
|
|
174
170
|
else {
|
|
175
171
|
logger_1.log.warn('Click will take place at original coordinates. If you ' +
|
|
@@ -196,7 +192,7 @@ class ImageElement {
|
|
|
196
192
|
],
|
|
197
193
|
};
|
|
198
194
|
// check if the driver has the appropriate performActions method
|
|
199
|
-
if ('performActions' in driver &&
|
|
195
|
+
if ('performActions' in driver && typeof driver.performActions === 'function') {
|
|
200
196
|
return await driver.performActions([action]);
|
|
201
197
|
}
|
|
202
198
|
// if not, warn and fall back to the other method
|
|
@@ -209,7 +205,7 @@ class ImageElement {
|
|
|
209
205
|
action: 'tap',
|
|
210
206
|
options: { x, y },
|
|
211
207
|
};
|
|
212
|
-
if ('performTouch' in driver &&
|
|
208
|
+
if ('performTouch' in driver && typeof driver.performTouch === 'function') {
|
|
213
209
|
return await driver.performTouch([action]);
|
|
214
210
|
}
|
|
215
211
|
throw new Error("Driver did not implement the 'performTouch' command. " +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"image-element.js","sourceRoot":"","sources":["../../lib/image-element.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"image-element.js","sourceRoot":"","sources":["../../lib/image-element.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../lib/plugin.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../lib/plugin.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAEzC,OAAO,EAAC,kBAAkB,EAAC,MAAM,UAAU,CAAC;AAG5C,OAAO,KAAK,EAAC,cAAc,EAAW,cAAc,EAAE,SAAS,EAAC,MAAM,eAAe,CAAC;AACtF,OAAO,KAAK,EAAC,eAAe,EAAE,iBAAiB,EAAE,iBAAiB,EAAC,MAAM,gBAAgB,CAAC;AAE1F,qBAAa,kBAAmB,SAAQ,UAAU;IAEhD,MAAM,CAAC,YAAY,EAAE,SAAS,CAAC,kBAAkB,CAAC,CAWvC;IACX,QAAQ,CAAC,MAAM,EAAE,kBAAkB,CAAC;gBAExB,UAAU,EAAE,MAAM;IAKxB,aAAa,CACjB,IAAI,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,EACxB,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,GAAG,MAAM,EAC3B,WAAW,EAAE,MAAM,GAAG,MAAM,EAC5B,OAAO,CAAC,EAAE,eAAe,GAAG,iBAAiB,GAAG,iBAAiB,GAChE,OAAO,CAAC,GAAG,CAAC;IAIT,WAAW,CAAC,IAAI,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAI3F,YAAY,CAAC,IAAI,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAI5F,MAAM,CACV,IAAI,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,EACxB,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,MAAM,EACf,GAAG,IAAI,EAAE,GAAG,EAAE,GACb,OAAO,CAAC,GAAG,CAAC;IAoBT,cAAc,CAClB,IAAI,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,EACxB,MAAM,EAAE,cAAc,EACtB,eAAe,EAAE,cAAc,EAAE,GAChC,OAAO,CAAC,GAAG,CAAC;YAgCD,KAAK;CAepB;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,GAAG,SAAS,CAEhE"}
|
package/build/lib/plugin.js
CHANGED
|
@@ -1,11 +1,7 @@
|
|
|
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
3
|
exports.ImageElementPlugin = void 0;
|
|
7
4
|
exports.getImgElFromArgs = getImgElFromArgs;
|
|
8
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
9
5
|
const driver_1 = require("appium/driver");
|
|
10
6
|
const support_1 = require("@appium/support");
|
|
11
7
|
const plugin_1 = require("appium/plugin");
|
|
@@ -63,12 +59,12 @@ class ImageElementPlugin extends plugin_1.BasePlugin {
|
|
|
63
59
|
for (const actionSequence of actionSequences) {
|
|
64
60
|
for (const action of actionSequence.actions) {
|
|
65
61
|
// The actions that can have an Element as the origin are "pointerMove" and "scroll".
|
|
66
|
-
if (!
|
|
62
|
+
if (!support_1.util.isPlainObject(action.origin)) {
|
|
67
63
|
continue;
|
|
68
64
|
}
|
|
69
65
|
const actionWithEl = action;
|
|
70
66
|
const elId = support_1.util.unwrapElement(actionWithEl.origin);
|
|
71
|
-
if (!
|
|
67
|
+
if (!elId?.startsWith(constants_1.IMAGE_ELEMENT_PREFIX)) {
|
|
72
68
|
continue;
|
|
73
69
|
}
|
|
74
70
|
const imgEl = this.finder.getImageElement(elId);
|
|
@@ -99,6 +95,6 @@ exports.ImageElementPlugin = ImageElementPlugin;
|
|
|
99
95
|
* @param args Command arguments.
|
|
100
96
|
*/
|
|
101
97
|
function getImgElFromArgs(args) {
|
|
102
|
-
return args.find((arg) =>
|
|
98
|
+
return args.find((arg) => typeof arg === 'string' && arg.startsWith(constants_1.IMAGE_ELEMENT_PREFIX));
|
|
103
99
|
}
|
|
104
100
|
//# sourceMappingURL=plugin.js.map
|
package/build/lib/plugin.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../lib/plugin.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../lib/plugin.ts"],"names":[],"mappings":"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"}
|
package/lib/compare.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import _ from 'lodash';
|
|
2
1
|
import {errors} from 'appium/driver';
|
|
3
2
|
import {
|
|
4
3
|
getImagesMatches,
|
|
@@ -44,7 +43,7 @@ export async function compareImages(
|
|
|
44
43
|
const img1 = Buffer.isBuffer(firstImage) ? firstImage : Buffer.from(firstImage, 'base64');
|
|
45
44
|
const img2 = Buffer.isBuffer(secondImage) ? secondImage : Buffer.from(secondImage, 'base64');
|
|
46
45
|
let result: MatchingResult | SimilarityResult | OccurrenceResult;
|
|
47
|
-
switch (
|
|
46
|
+
switch (mode.toLowerCase()) {
|
|
48
47
|
case MATCH_FEATURES_MODE.toLowerCase():
|
|
49
48
|
try {
|
|
50
49
|
result = await getImagesMatches(img1, img2, options as MatchingOptions);
|
package/lib/finder.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import _ from 'lodash';
|
|
2
1
|
import {LRUCache} from 'lru-cache';
|
|
3
2
|
import {errors} from 'appium/driver';
|
|
4
3
|
import {ImageElement} from './image-element';
|
|
@@ -101,7 +100,7 @@ export class ImageElementFinder {
|
|
|
101
100
|
} = settings;
|
|
102
101
|
|
|
103
102
|
log.info(`Finding image element with match threshold ${threshold}`);
|
|
104
|
-
if (!driver.getWindowRect && !
|
|
103
|
+
if (!driver.getWindowRect && !Object.hasOwn(driver, 'getWindowSize')) {
|
|
105
104
|
throw new Error("This driver does not support the required 'getWindowRect' command");
|
|
106
105
|
}
|
|
107
106
|
let screenSize: Size;
|
|
@@ -173,7 +172,7 @@ export class ImageElementFinder {
|
|
|
173
172
|
};
|
|
174
173
|
|
|
175
174
|
const elOrEls = await compareImages(MATCH_TEMPLATE_MODE, screenshot, template, comparisonOpts);
|
|
176
|
-
return
|
|
175
|
+
return (Array.isArray(elOrEls) ? elOrEls : [elOrEls]).some(pushIfOk);
|
|
177
176
|
} catch (err: any) {
|
|
178
177
|
// if compareImages fails, we'll get a specific error, but we should
|
|
179
178
|
// retry, so trap that and just return false to trigger the next round of
|
|
@@ -200,7 +199,7 @@ export class ImageElementFinder {
|
|
|
200
199
|
}
|
|
201
200
|
}
|
|
202
201
|
|
|
203
|
-
if (
|
|
202
|
+
if (results.length === 0) {
|
|
204
203
|
if (multiple) {
|
|
205
204
|
return [];
|
|
206
205
|
}
|
|
@@ -242,7 +241,7 @@ export class ImageElementFinder {
|
|
|
242
241
|
async ensureTemplateSize(template: Buffer, maxSize: Size): Promise<Buffer> {
|
|
243
242
|
const imgObj = sharp(template);
|
|
244
243
|
const {width: tplWidth, height: tplHeight} = await imgObj.metadata();
|
|
245
|
-
if (
|
|
244
|
+
if (tplWidth == null || tplHeight == null) {
|
|
246
245
|
throw new Error(`Template width/height cannot be determined. Is it a valid image?`);
|
|
247
246
|
}
|
|
248
247
|
|
|
@@ -470,7 +469,7 @@ export class ImageElementFinder {
|
|
|
470
469
|
|
|
471
470
|
let imgObj = sharp(template);
|
|
472
471
|
const {width: baseTempWidth, height: baseTempHeigh} = await imgObj.metadata();
|
|
473
|
-
if (
|
|
472
|
+
if (baseTempWidth == null || baseTempHeigh == null) {
|
|
474
473
|
throw new Error(`Template width/height cannot be determined. Is it a valid image?`);
|
|
475
474
|
}
|
|
476
475
|
|
package/lib/image-element.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import _ from 'lodash';
|
|
2
1
|
import {errors} from 'appium/driver';
|
|
3
2
|
import {util} from '@appium/support';
|
|
4
3
|
import {log} from './logger';
|
|
@@ -203,7 +202,7 @@ export class ImageElement {
|
|
|
203
202
|
);
|
|
204
203
|
if (updatePos) {
|
|
205
204
|
log.warn('Click will proceed at new coordinates');
|
|
206
|
-
this.rect =
|
|
205
|
+
this.rect = {...newImgEl.rect};
|
|
207
206
|
} else {
|
|
208
207
|
log.warn(
|
|
209
208
|
'Click will take place at original coordinates. If you ' +
|
|
@@ -234,7 +233,7 @@ export class ImageElement {
|
|
|
234
233
|
};
|
|
235
234
|
|
|
236
235
|
// check if the driver has the appropriate performActions method
|
|
237
|
-
if ('performActions' in driver &&
|
|
236
|
+
if ('performActions' in driver && typeof driver.performActions === 'function') {
|
|
238
237
|
return await driver.performActions([action]);
|
|
239
238
|
}
|
|
240
239
|
|
|
@@ -250,7 +249,7 @@ export class ImageElement {
|
|
|
250
249
|
options: {x, y},
|
|
251
250
|
};
|
|
252
251
|
|
|
253
|
-
if ('performTouch' in driver &&
|
|
252
|
+
if ('performTouch' in driver && typeof driver.performTouch === 'function') {
|
|
254
253
|
return await driver.performTouch([action]);
|
|
255
254
|
}
|
|
256
255
|
|
package/lib/plugin.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import _ from 'lodash';
|
|
2
1
|
import {errors} from 'appium/driver';
|
|
3
2
|
import {util} from '@appium/support';
|
|
4
3
|
import {BasePlugin} from 'appium/plugin';
|
|
@@ -83,14 +82,14 @@ export class ImageElementPlugin extends BasePlugin {
|
|
|
83
82
|
for (const actionSequence of actionSequences) {
|
|
84
83
|
for (const action of actionSequence.actions) {
|
|
85
84
|
// The actions that can have an Element as the origin are "pointerMove" and "scroll".
|
|
86
|
-
if (!
|
|
85
|
+
if (!util.isPlainObject((action as any).origin)) {
|
|
87
86
|
continue;
|
|
88
87
|
}
|
|
89
88
|
|
|
90
89
|
const actionWithEl = action as any;
|
|
91
90
|
|
|
92
91
|
const elId = util.unwrapElement(actionWithEl.origin as Element);
|
|
93
|
-
if (!
|
|
92
|
+
if (!elId?.startsWith(IMAGE_ELEMENT_PREFIX)) {
|
|
94
93
|
continue;
|
|
95
94
|
}
|
|
96
95
|
|
|
@@ -132,5 +131,5 @@ export class ImageElementPlugin extends BasePlugin {
|
|
|
132
131
|
* @param args Command arguments.
|
|
133
132
|
*/
|
|
134
133
|
export function getImgElFromArgs(args: any[]): string | undefined {
|
|
135
|
-
return args.find((arg) =>
|
|
134
|
+
return args.find((arg) => typeof arg === 'string' && arg.startsWith(IMAGE_ELEMENT_PREFIX));
|
|
136
135
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@appium/images-plugin",
|
|
3
|
-
"version": "4.2.
|
|
3
|
+
"version": "4.2.5",
|
|
4
4
|
"description": "Plugin for working with images and image elements in Appium",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"automation",
|
|
@@ -40,10 +40,9 @@
|
|
|
40
40
|
"test:e2e": "mocha --exit --timeout 40s --slow 20s \"./test/e2e/**/*.spec.*ts\""
|
|
41
41
|
},
|
|
42
42
|
"dependencies": {
|
|
43
|
-
"@appium/opencv": "4.1.
|
|
44
|
-
"@appium/support": "7.2.
|
|
45
|
-
"
|
|
46
|
-
"lru-cache": "11.3.5",
|
|
43
|
+
"@appium/opencv": "4.1.5",
|
|
44
|
+
"@appium/support": "7.2.3",
|
|
45
|
+
"lru-cache": "11.5.0",
|
|
47
46
|
"sharp": "0.34.5"
|
|
48
47
|
},
|
|
49
48
|
"peerDependencies": {
|
|
@@ -60,5 +59,5 @@
|
|
|
60
59
|
"publishConfig": {
|
|
61
60
|
"access": "public"
|
|
62
61
|
},
|
|
63
|
-
"gitHead": "
|
|
62
|
+
"gitHead": "8018f8b70ecc975fa115e19072ef337b8473865d"
|
|
64
63
|
}
|