(#354) Upgraded libnut to v2.1.5 to enable the info message on access… (#355)

* (#354) Upgraded libnut to v2.1.5 to enable the info message on accessibility permissions

* (#354) Fix duplication issues

Author: s1hofmann

lib/screen.class.ts

@@ -99,18 +99,15 @@ export class ScreenClass {
         template: Image | Promise<Image>,
         params?: OptionalSearchParameters,
     ): Promise<Region> {
-        const minMatch = (params && params.confidence) || this.config.confidence;
-        const screenSize = await this.providerRegistry.getScreen().screenSize();
-        const searchRegion = (params && params.searchRegion) || screenSize;
-        const searchMultipleScales = (params && params.searchMultipleScales)
-
-        const needle = await template;
+        const {
+            minMatch,
+            screenSize,
+            searchRegion,
+            screenImage,
+            searchMultipleScales
+        } = await this.getFindParameters(params);
 
-        if (!isImage(needle)) {
-            throw Error(`find requires an Image, but received ${JSON.stringify(needle)}`)
-        }
-
-        const screenImage = await this.providerRegistry.getScreen().grabScreenRegion(searchRegion);
+        const needle = await ScreenClass.getNeedle(template);
 
         const matchRequest = new MatchRequest(
             screenImage,
@@ -155,18 +152,15 @@ export class ScreenClass {
         template: FirstArgumentType<typeof ScreenClass.prototype.find>,
         params?: OptionalSearchParameters,
     ): Promise<Region[]> {
-        const minMatch = (params && params.confidence) || this.config.confidence;
-        const screenSize = await this.providerRegistry.getScreen().screenSize();
-        const searchRegion = (params && params.searchRegion) || screenSize;
-        const searchMultipleScales = (params && params.searchMultipleScales)
-
-        const needle = await template;
-
-        if (!isImage(needle)) {
-            throw Error(`findAll requires an Image, but received ${JSON.stringify(needle)}`)
-        }
+        const {
+            minMatch,
+            screenSize,
+            searchRegion,
+            screenImage,
+            searchMultipleScales
+        } = await this.getFindParameters(params);
 
-        const screenImage = await this.providerRegistry.getScreen().grabScreenRegion(searchRegion);
+        const needle = await ScreenClass.getNeedle(template);
 
         const matchRequest = new MatchRequest(
             screenImage,
@@ -356,4 +350,29 @@ export class ScreenClass {
         await this.providerRegistry.getImageWriter().store({image, path: outputPath})
         return outputPath;
     }
+
+    private async getFindParameters(params?: OptionalSearchParameters) {
+        const minMatch = params?.confidence ?? this.config.confidence;
+        const screenSize = await this.providerRegistry.getScreen().screenSize();
+        const searchRegion = params?.searchRegion ?? screenSize;
+        const screenImage = await this.providerRegistry.getScreen().grabScreenRegion(searchRegion);
+        const searchMultipleScales = params?.searchMultipleScales ?? true;
+
+        return ({
+            minMatch,
+            screenSize,
+            searchRegion,
+            screenImage,
+            searchMultipleScales
+        });
+    }
+
+    private static async getNeedle(template: FirstArgumentType<typeof ScreenClass.prototype.find>) {
+        const needle = await template;
+
+        if (!isImage(needle)) {
+            throw Error(`find requires an Image, but received ${JSON.stringify(needle)}`)
+        }
+        return needle;
+    }
 }

package-lock.json

@@ -59,7 +59,7 @@
     "typedoc": "typedoc --options ./typedoc.js --out ./docs lib/"
   },
   "dependencies": {
-    "@nut-tree/libnut": "2.1.4",
+    "@nut-tree/libnut": "2.1.5",
     "clipboardy": "2.3.0",
     "jimp": "0.16.1",
     "node-abort-controller": "2.0.0"