Skip to content

Commit 9a624d9

Browse files
s1hofmanns1hofmann
committed
(#371) Change loglevel on mouse.setPosition to trace, log matchresult on screen.find, refine log output on providerregistry
1 parent 53414e5 commit 9a624d9

File tree

3 files changed

+191
-176
lines changed

3 files changed

+191
-176
lines changed

‎lib/mouse.class.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export class MouseClass {
5252
}
5353
this.providerRegistry
5454
.getLogProvider()
55-
.info("Setting mouse position", target);
55+
.trace("Setting mouse position", target);
5656
return new Promise<MouseClass>(async (resolve, reject) => {
5757
try {
5858
await this.providerRegistry.getMouse().setMousePosition(target);

‎lib/provider/provider-registry.class.ts

Lines changed: 181 additions & 172 deletions
Original file line numberDiff line numberDiff line change
@@ -1,209 +1,218 @@
1-
import {ClipboardProviderInterface} from "./clipboard-provider.interface";
2-
import {ImageFinderInterface} from "./image-finder.interface";
3-
import {KeyboardProviderInterface} from "./keyboard-provider.interface";
4-
import {MouseProviderInterface} from "./mouse-provider.interface";
5-
import {ScreenProviderInterface} from "./screen-provider.interface";
6-
import {WindowProviderInterface} from "./window-provider.interface";
1+
import { ClipboardProviderInterface } from "./clipboard-provider.interface";
2+
import { ImageFinderInterface } from "./image-finder.interface";
3+
import { KeyboardProviderInterface } from "./keyboard-provider.interface";
4+
import { MouseProviderInterface } from "./mouse-provider.interface";
5+
import { ScreenProviderInterface } from "./screen-provider.interface";
6+
import { WindowProviderInterface } from "./window-provider.interface";
77

88
import Clipboard from "./native/clipboardy-clipboard.class";
99
import Mouse from "./native/libnut-mouse.class";
1010
import Keyboard from "./native/libnut-keyboard.class";
1111
import Screen from "./native/libnut-screen.class";
1212
import Window from "./native/libnut-window.class";
13-
import {ImageReader} from "./image-reader.type";
14-
import {ImageWriter} from "./image-writer.type";
15-
import {ImageProcessor} from "./image-processor.interface";
13+
import { ImageReader } from "./image-reader.type";
14+
import { ImageWriter } from "./image-writer.type";
15+
import { ImageProcessor } from "./image-processor.interface";
1616

1717
import ImageReaderImpl from "./io/jimp-image-reader.class";
1818
import ImageWriterImpl from "./io/jimp-image-writer.class";
1919
import ImageProcessorImpl from "./image/jimp-image-processor.class";
20-
import {LogProviderInterface, wrapLogger} from "./log-provider.interface";
21-
import {NoopLogProvider} from "./log/noop-log-provider.class";
20+
import { LogProviderInterface, wrapLogger } from "./log-provider.interface";
21+
import { NoopLogProvider } from "./log/noop-log-provider.class";
2222

2323
export interface ProviderRegistry {
24-
getClipboard(): ClipboardProviderInterface;
24+
getClipboard(): ClipboardProviderInterface;
2525

26-
registerClipboardProvider(value: ClipboardProviderInterface): void;
26+
registerClipboardProvider(value: ClipboardProviderInterface): void;
2727

28-
getKeyboard(): KeyboardProviderInterface;
28+
getKeyboard(): KeyboardProviderInterface;
2929

30-
registerKeyboardProvider(value: KeyboardProviderInterface): void;
30+
registerKeyboardProvider(value: KeyboardProviderInterface): void;
3131

32-
getMouse(): MouseProviderInterface;
32+
getMouse(): MouseProviderInterface;
3333

34-
registerMouseProvider(value: MouseProviderInterface): void;
34+
registerMouseProvider(value: MouseProviderInterface): void;
3535

36-
getScreen(): ScreenProviderInterface;
36+
getScreen(): ScreenProviderInterface;
3737

38-
registerScreenProvider(value: ScreenProviderInterface): void;
38+
registerScreenProvider(value: ScreenProviderInterface): void;
3939

40-
getWindow(): WindowProviderInterface;
40+
getWindow(): WindowProviderInterface;
4141

42-
registerWindowProvider(value: WindowProviderInterface): void;
42+
registerWindowProvider(value: WindowProviderInterface): void;
4343

44-
getImageFinder(): ImageFinderInterface;
44+
getImageFinder(): ImageFinderInterface;
4545

46-
registerImageFinder(value: ImageFinderInterface): void;
46+
registerImageFinder(value: ImageFinderInterface): void;
4747

48-
getImageReader(): ImageReader;
48+
getImageReader(): ImageReader;
4949

50-
registerImageReader(value: ImageReader): void;
50+
registerImageReader(value: ImageReader): void;
5151

52-
getImageWriter(): ImageWriter;
52+
getImageWriter(): ImageWriter;
5353

54-
registerImageWriter(value: ImageWriter): void;
54+
registerImageWriter(value: ImageWriter): void;
5555

56-
getImageProcessor(): ImageProcessor;
56+
getImageProcessor(): ImageProcessor;
5757

58-
registerImageProcessor(value: ImageProcessor): void;
58+
registerImageProcessor(value: ImageProcessor): void;
5959

60-
getLogProvider(): LogProviderInterface;
60+
getLogProvider(): LogProviderInterface;
6161

62-
registerLogProvider(value: LogProviderInterface): void;
62+
registerLogProvider(value: LogProviderInterface): void;
6363
}
6464

6565
class DefaultProviderRegistry implements ProviderRegistry {
66-
private _clipboard?: ClipboardProviderInterface;
67-
private _finder?: ImageFinderInterface;
68-
private _keyboard?: KeyboardProviderInterface;
69-
private _mouse?: MouseProviderInterface;
70-
private _screen?: ScreenProviderInterface;
71-
private _window?: WindowProviderInterface;
72-
private _imageReader?: ImageReader;
73-
private _imageWriter?: ImageWriter;
74-
private _imageProcessor?: ImageProcessor;
75-
private _logProvider?: LogProviderInterface;
76-
77-
getClipboard(): ClipboardProviderInterface {
78-
if (this._clipboard) {
79-
this.getLogProvider().debug("Fetching clipboard provider");
80-
return this._clipboard;
81-
}
82-
throw new Error(`No ClipboardProvider registered`);
83-
}
84-
85-
registerClipboardProvider(value: ClipboardProviderInterface) {
86-
this._clipboard = value;
87-
this.getLogProvider().info("Registered new clipboard provider", value);
88-
}
89-
90-
getImageFinder(): ImageFinderInterface {
91-
if (this._finder) {
92-
this.getLogProvider().debug("Fetching image finder");
93-
return this._finder;
94-
}
95-
throw new Error(`No ImageFinder registered`);
96-
}
97-
98-
registerImageFinder(value: ImageFinderInterface) {
99-
this._finder = value;
100-
this.getLogProvider().info("Registered new image finder", value);
101-
}
102-
103-
getKeyboard(): KeyboardProviderInterface {
104-
if (this._keyboard) {
105-
this.getLogProvider().debug("Fetching keyboard provider");
106-
return this._keyboard;
107-
}
108-
throw new Error(`No KeyboardProvider registered`);
109-
}
110-
111-
registerKeyboardProvider(value: KeyboardProviderInterface) {
112-
this._keyboard = value;
113-
this.getLogProvider().info("Registered new keyboard provider", value);
114-
}
115-
116-
getMouse(): MouseProviderInterface {
117-
if (this._mouse) {
118-
this.getLogProvider().debug("Fetching mouse provider");
119-
return this._mouse;
120-
}
121-
throw new Error(`No MouseProvider registered`);
122-
}
123-
124-
registerMouseProvider(value: MouseProviderInterface) {
125-
this._mouse = value;
126-
this.getLogProvider().info("Registered new mouse provider", value);
127-
}
128-
129-
getScreen(): ScreenProviderInterface {
130-
if (this._screen) {
131-
this.getLogProvider().debug("Fetching screen provider");
132-
return this._screen;
133-
}
134-
throw new Error(`No ScreenProvider registered`);
135-
}
136-
137-
registerScreenProvider(value: ScreenProviderInterface) {
138-
this._screen = value;
139-
this.getLogProvider().info("Registered new screen provider", value);
140-
}
141-
142-
getWindow(): WindowProviderInterface {
143-
if (this._window) {
144-
this.getLogProvider().debug("Fetching window provider");
145-
return this._window;
146-
}
147-
throw new Error(`No WindowProvider registered`);
148-
}
149-
150-
registerWindowProvider(value: WindowProviderInterface) {
151-
this._window = value;
152-
this.getLogProvider().info("Registered new window provider", value);
153-
}
154-
155-
getImageReader(): ImageReader {
156-
if (this._imageReader) {
157-
this.getLogProvider().debug("Fetching image reader");
158-
return this._imageReader;
159-
}
160-
throw new Error(`No ImageReader registered`);
161-
}
162-
163-
registerImageReader(value: ImageReader) {
164-
this._imageReader = value;
165-
this.getLogProvider().info("Registered new image reader", value);
166-
}
167-
168-
getImageWriter(): ImageWriter {
169-
if (this._imageWriter) {
170-
this.getLogProvider().debug("Fetching image writer");
171-
return this._imageWriter;
172-
}
173-
throw new Error(`No ImageWriter registered`);
174-
}
175-
176-
registerImageWriter(value: ImageWriter) {
177-
this._imageWriter = value;
178-
this.getLogProvider().info("Registered new image writer", value);
179-
}
180-
181-
getImageProcessor(): ImageProcessor {
182-
if (this._imageProcessor) {
183-
this.getLogProvider().debug("Fetching image processor");
184-
return this._imageProcessor;
185-
}
186-
throw new Error(`No ImageProcessor registered`);
187-
}
188-
189-
registerImageProcessor(value: ImageProcessor): void {
190-
this._imageProcessor = value;
191-
this.getLogProvider().info("Registered new image processor", value);
192-
}
193-
194-
getLogProvider(): LogProviderInterface {
195-
if (this._logProvider) {
196-
return this._logProvider;
197-
}
198-
199-
// Fallback to avoid errors caused by logging
200-
return new NoopLogProvider();
201-
}
202-
203-
registerLogProvider(value: LogProviderInterface): void {
204-
this._logProvider = wrapLogger(value);
205-
this.getLogProvider().info("Registered new log provider", value);
206-
}
66+
private _clipboard?: ClipboardProviderInterface;
67+
private _finder?: ImageFinderInterface;
68+
private _keyboard?: KeyboardProviderInterface;
69+
private _mouse?: MouseProviderInterface;
70+
private _screen?: ScreenProviderInterface;
71+
private _window?: WindowProviderInterface;
72+
private _imageReader?: ImageReader;
73+
private _imageWriter?: ImageWriter;
74+
private _imageProcessor?: ImageProcessor;
75+
private _logProvider?: LogProviderInterface;
76+
77+
getClipboard(): ClipboardProviderInterface {
78+
if (this._clipboard) {
79+
return this._clipboard;
80+
}
81+
const error = new Error(`No ClipboardProvider registered`);
82+
this.getLogProvider().error(error);
83+
throw error;
84+
}
85+
86+
registerClipboardProvider(value: ClipboardProviderInterface) {
87+
this._clipboard = value;
88+
this.getLogProvider().info("Registered new clipboard provider", value);
89+
}
90+
91+
getImageFinder(): ImageFinderInterface {
92+
if (this._finder) {
93+
return this._finder;
94+
}
95+
const error = new Error(`No ImageFinder registered`);
96+
this.getLogProvider().error(error);
97+
throw error;
98+
}
99+
100+
registerImageFinder(value: ImageFinderInterface) {
101+
this._finder = value;
102+
this.getLogProvider().info("Registered new image finder", value);
103+
}
104+
105+
getKeyboard(): KeyboardProviderInterface {
106+
if (this._keyboard) {
107+
return this._keyboard;
108+
}
109+
const error = new Error(`No KeyboardProvider registered`);
110+
this.getLogProvider().error(error);
111+
throw error;
112+
}
113+
114+
registerKeyboardProvider(value: KeyboardProviderInterface) {
115+
this._keyboard = value;
116+
this.getLogProvider().info("Registered new keyboard provider", value);
117+
}
118+
119+
getMouse(): MouseProviderInterface {
120+
if (this._mouse) {
121+
return this._mouse;
122+
}
123+
const error = new Error(`No MouseProvider registered`);
124+
this.getLogProvider().error(error);
125+
throw error;
126+
}
127+
128+
registerMouseProvider(value: MouseProviderInterface) {
129+
this._mouse = value;
130+
this.getLogProvider().info("Registered new mouse provider", value);
131+
}
132+
133+
getScreen(): ScreenProviderInterface {
134+
if (this._screen) {
135+
return this._screen;
136+
}
137+
const error = new Error(`No ScreenProvider registered`);
138+
this.getLogProvider().error(error);
139+
throw error;
140+
}
141+
142+
registerScreenProvider(value: ScreenProviderInterface) {
143+
this._screen = value;
144+
this.getLogProvider().info("Registered new screen provider", value);
145+
}
146+
147+
getWindow(): WindowProviderInterface {
148+
if (this._window) {
149+
return this._window;
150+
}
151+
const error = new Error(`No WindowProvider registered`);
152+
this.getLogProvider().error(error);
153+
throw error;
154+
}
155+
156+
registerWindowProvider(value: WindowProviderInterface) {
157+
this._window = value;
158+
this.getLogProvider().info("Registered new window provider", value);
159+
}
160+
161+
getImageReader(): ImageReader {
162+
if (this._imageReader) {
163+
return this._imageReader;
164+
}
165+
const error = new Error(`No ImageReader registered`);
166+
this.getLogProvider().error(error);
167+
throw error;
168+
}
169+
170+
registerImageReader(value: ImageReader) {
171+
this._imageReader = value;
172+
this.getLogProvider().info("Registered new image reader", value);
173+
}
174+
175+
getImageWriter(): ImageWriter {
176+
if (this._imageWriter) {
177+
return this._imageWriter;
178+
}
179+
const error = new Error(`No ImageWriter registered`);
180+
this.getLogProvider().error(error);
181+
throw error;
182+
}
183+
184+
registerImageWriter(value: ImageWriter) {
185+
this._imageWriter = value;
186+
this.getLogProvider().info("Registered new image writer", value);
187+
}
188+
189+
getImageProcessor(): ImageProcessor {
190+
if (this._imageProcessor) {
191+
return this._imageProcessor;
192+
}
193+
const error = new Error(`No ImageProcessor registered`);
194+
this.getLogProvider().error(error);
195+
throw error;
196+
}
197+
198+
registerImageProcessor(value: ImageProcessor): void {
199+
this._imageProcessor = value;
200+
this.getLogProvider().info("Registered new image processor", value);
201+
}
202+
203+
getLogProvider(): LogProviderInterface {
204+
if (this._logProvider) {
205+
return this._logProvider;
206+
}
207+
208+
// Fallback to avoid errors caused by logging
209+
return new NoopLogProvider();
210+
}
211+
212+
registerLogProvider(value: LogProviderInterface): void {
213+
this._logProvider = wrapLogger(value);
214+
this.getLogProvider().info("Registered new log provider", value);
215+
}
207216
}
208217

209218
const providerRegistry = new DefaultProviderRegistry();

0 commit comments

Comments
 (0)