@wdio/ocr-service 2.1.1 → 2.2.0
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/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
# @wdio/ocr-service
|
|
2
2
|
|
|
3
|
+
## 2.2.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- 786248e: Upgrade Jimp to the latest major
|
|
8
|
+
|
|
3
9
|
## 2.1.1
|
|
4
10
|
|
|
5
11
|
### Patch Changes
|
|
@@ -8,9 +14,9 @@
|
|
|
8
14
|
|
|
9
15
|
Functions in utils such as `getData.ts` used the global `browser`, but this is not browser is not the browser making for example the `ocrClick` function call when the we are running in the multiremote context. This could lead to `ERR_BUFFER_OUT_OF_BOUNDS` error. This release fixes that error.
|
|
10
16
|
|
|
11
|
-
|
|
17
|
+
# Committers: 1
|
|
12
18
|
|
|
13
|
-
|
|
19
|
+
- Chanatan Charnkijtawarush ([@ccharnkij](https://github.com/ccharnkij))
|
|
14
20
|
|
|
15
21
|
## 2.1.0
|
|
16
22
|
|
package/dist/types.d.ts
CHANGED
|
@@ -98,7 +98,7 @@ export type Words = Line & {
|
|
|
98
98
|
wc: number;
|
|
99
99
|
};
|
|
100
100
|
export type TessaractDataOptions = {
|
|
101
|
-
filePath: string
|
|
101
|
+
filePath: `${string}.${string}`;
|
|
102
102
|
language: string;
|
|
103
103
|
};
|
|
104
104
|
export type ParseWordData = {
|
|
@@ -108,7 +108,7 @@ export type ParseWordData = {
|
|
|
108
108
|
export type GetTextPositionsOptions = DefaultMethodOptions & {};
|
|
109
109
|
export type GetTextPositions = {
|
|
110
110
|
dprPosition: Rectangles;
|
|
111
|
-
filePath: string
|
|
111
|
+
filePath: `${string}.${string}`;
|
|
112
112
|
originalPosition: Rectangles;
|
|
113
113
|
text: string;
|
|
114
114
|
};
|
|
@@ -184,7 +184,7 @@ export type FuzzyElement = {
|
|
|
184
184
|
/**
|
|
185
185
|
* The path of the OCR screenshot
|
|
186
186
|
*/
|
|
187
|
-
filePath: string
|
|
187
|
+
filePath: `${string}.${string}`;
|
|
188
188
|
/**
|
|
189
189
|
* The original position
|
|
190
190
|
*/
|
|
@@ -231,10 +231,10 @@ export type ProcessImageOptions = {
|
|
|
231
231
|
screenshot: string;
|
|
232
232
|
};
|
|
233
233
|
export type ProcessImage = {
|
|
234
|
-
filePath: string
|
|
234
|
+
filePath: `${string}.${string}`;
|
|
235
235
|
};
|
|
236
236
|
export type DrawHighlightedWords = {
|
|
237
|
-
filePath: string
|
|
237
|
+
filePath: `${string}.${string}`;
|
|
238
238
|
highlights: Rectangles[];
|
|
239
239
|
};
|
|
240
240
|
export type ScreenshotSize = {
|
|
@@ -270,7 +270,7 @@ export type UnprocessedSystemStringElement = {
|
|
|
270
270
|
};
|
|
271
271
|
};
|
|
272
272
|
export type TargetOptions = {
|
|
273
|
-
filePath: string
|
|
273
|
+
filePath: `${string}.${string}`;
|
|
274
274
|
targetX: number;
|
|
275
275
|
targetY: number;
|
|
276
276
|
};
|
|
@@ -297,7 +297,7 @@ export type UnprocessedNodejsWord = {
|
|
|
297
297
|
*/
|
|
298
298
|
export interface GetData extends GetOcrData {
|
|
299
299
|
dpr: number;
|
|
300
|
-
filePath: string
|
|
300
|
+
filePath: `${string}.${string}`;
|
|
301
301
|
}
|
|
302
302
|
export type OcrGetElementPositionByText = {
|
|
303
303
|
/**
|
|
@@ -309,7 +309,7 @@ export type OcrGetElementPositionByText = {
|
|
|
309
309
|
/**
|
|
310
310
|
* The path of the OCR screenshot
|
|
311
311
|
*/
|
|
312
|
-
filePath: string
|
|
312
|
+
filePath: `${string}.${string}`;
|
|
313
313
|
/**
|
|
314
314
|
* the matched string
|
|
315
315
|
*/
|
package/dist/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"imageProcessing.d.ts","sourceRoot":"","sources":["../../src/utils/imageProcessing.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,oBAAoB,EAAE,YAAY,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAKzG,wBAAsB,YAAY,CAAC,EAAE,QAAQ,EAAE,iBAAiB,EAAE,SAAS,EAAE,KAAK,EAAE,aAAa,EAAE,UAAU,EAAE,EAAC,mBAAmB,GAChI,OAAO,CAAC,YAAY,CAAC,
|
|
1
|
+
{"version":3,"file":"imageProcessing.d.ts","sourceRoot":"","sources":["../../src/utils/imageProcessing.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,oBAAoB,EAAE,YAAY,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAKzG,wBAAsB,YAAY,CAAC,EAAE,QAAQ,EAAE,iBAAiB,EAAE,SAAS,EAAE,KAAK,EAAE,aAAa,EAAE,UAAU,EAAE,EAAC,mBAAmB,GAChI,OAAO,CAAC,YAAY,CAAC,CA0BvB;AAED,wBAAsB,UAAU,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,aAAa,iBAc7E;AAED,wBAAsB,oBAAoB,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,oBAAoB,iBA+BxF"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import logger from '@wdio/logger';
|
|
2
|
-
import Jimp from 'jimp';
|
|
2
|
+
import { intToRGBA, Jimp, rgbaToInt } from 'jimp';
|
|
3
3
|
import { dirname, join } from 'node:path';
|
|
4
4
|
import { fileURLToPath } from 'node:url';
|
|
5
5
|
const __dirname = dirname(fileURLToPath(import.meta.url));
|
|
@@ -19,11 +19,12 @@ export async function processImage({ contrast, elementRectangles, isAndroid, isI
|
|
|
19
19
|
const cropY = Math.max(0, elementRectangles.y);
|
|
20
20
|
const cropWidth = Math.min(elementRectangles.width, screenshotSize.width - cropX);
|
|
21
21
|
const cropHeight = Math.min(elementRectangles.height, screenshotSize.height - cropY);
|
|
22
|
-
image.crop(cropX, cropY, cropWidth, cropHeight)
|
|
22
|
+
// image.crop(cropX, cropY, cropWidth, cropHeight)
|
|
23
|
+
image.crop({ w: cropWidth, h: cropHeight, x: cropX, y: cropY });
|
|
23
24
|
fileName = `${platform}-${timestamp}-cropped.png`;
|
|
24
25
|
filePath = join(ocrImagesPath, fileName);
|
|
25
26
|
}
|
|
26
|
-
await image.
|
|
27
|
+
await image.write(filePath);
|
|
27
28
|
return { filePath };
|
|
28
29
|
}
|
|
29
30
|
export async function drawTarget({ filePath, targetX, targetY }) {
|
|
@@ -36,7 +37,7 @@ export async function drawTarget({ filePath, targetX, targetY }) {
|
|
|
36
37
|
const xPosition = targetX - (targetImage.bitmap.width / 2);
|
|
37
38
|
const yPosition = targetY - (targetImage.bitmap.height / 2);
|
|
38
39
|
sourceImage.composite(targetImage, xPosition, yPosition);
|
|
39
|
-
await sourceImage.
|
|
40
|
+
await sourceImage.write(filePath);
|
|
40
41
|
}
|
|
41
42
|
catch (error) {
|
|
42
43
|
log.error('Failed to draw target on image:', error);
|
|
@@ -54,18 +55,18 @@ export async function drawHighlightedWords({ filePath, highlights }) {
|
|
|
54
55
|
for (let x = left; x < left + width; x++) {
|
|
55
56
|
// Get the current pixel color
|
|
56
57
|
const currentColor = image.getPixelColor(x, y);
|
|
57
|
-
const rgba =
|
|
58
|
+
const rgba = intToRGBA(currentColor);
|
|
58
59
|
// Calculate new color values using simple alpha blending
|
|
59
60
|
const newR = (highlightColor.r * highlightColor.a) + (rgba.r * (1 - highlightColor.a));
|
|
60
61
|
const newG = (highlightColor.g * highlightColor.a) + (rgba.g * (1 - highlightColor.a));
|
|
61
62
|
const newB = (highlightColor.b * highlightColor.a) + (rgba.b * (1 - highlightColor.a));
|
|
62
63
|
const newA = rgba.a; // Use original alpha to maintain image integrity
|
|
63
64
|
// Set the new pixel color
|
|
64
|
-
image.setPixelColor(
|
|
65
|
+
image.setPixelColor(rgbaToInt(newR, newG, newB, newA), x, y);
|
|
65
66
|
}
|
|
66
67
|
}
|
|
67
68
|
});
|
|
68
|
-
await image.
|
|
69
|
+
await image.write(filePath);
|
|
69
70
|
}
|
|
70
71
|
catch (error) {
|
|
71
72
|
log.error('Failed to highlight words on image:', error);
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@wdio/ocr-service",
|
|
3
3
|
"author": "Wim Selles - wswebcreation",
|
|
4
4
|
"description": "A WebdriverIO service that is using Tesseract OCR for Desktop/Mobile Web and Mobile Native App tests.",
|
|
5
|
-
"version": "2.
|
|
5
|
+
"version": "2.2.0",
|
|
6
6
|
"license": "MIT",
|
|
7
7
|
"homepage": "https://webdriver.io/docs/visual-testing",
|
|
8
8
|
"repository": {
|
|
@@ -26,8 +26,8 @@
|
|
|
26
26
|
"@wdio/logger": "^9.1.0",
|
|
27
27
|
"@wdio/types": "^9.1.2",
|
|
28
28
|
"fuse.js": "^7.0.0",
|
|
29
|
-
"@inquirer/prompts": "
|
|
30
|
-
"jimp": "^
|
|
29
|
+
"@inquirer/prompts": "6.0.1",
|
|
30
|
+
"jimp": "^1.6.0",
|
|
31
31
|
"node-tesseract-ocr": "^2.2.1",
|
|
32
32
|
"tesseract.js": "^5.1.1",
|
|
33
33
|
"xml2js": "^0.6.2"
|