Skip to content

Bugfix/(nut tree/nut.js#477)/remove permission check for delay setters #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 16, 2023
Merged

Bugfix/(nut tree/nut.js#477)/remove permission check for delay setters #153

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a7562e3
(nut-tree/nut.js#477) Removed both setMouseDelay and setKeyboardDelay…
s1hofmann Feb 16, 2023
1f37859
(nut-tree/nut.js#477) Update permissionCheck.js to cache permission c…
s1hofmann Feb 16, 2023
956fed9
(nut-tree/nut.js#477) Re-require native bindings on error
s1hofmann Feb 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions permissionCheck.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
const libnut = require("bindings")("libnut");
let libnut = require("bindings")("libnut");

let hasScreenRecordingPermission = false;
let hasAccessibilityPermission = false;

try {
const permissions = require("@nut-tree/node-mac-permissions");
Expand All @@ -9,25 +12,27 @@ try {
};

const askForAccessibility = (nativeFunction, functionName) => {
if (process.platform !== 'darwin') {
if (process.platform !== 'darwin' || hasAccessibilityPermission) {
return nativeFunction;
}
const accessibilityStatus = permissions.getAuthStatus("accessibility");

if (accessibilityStatus === 'authorized') {
hasAccessibilityPermission = true;
return nativeFunction;
} else if (accessibilityStatus === 'not determined' || accessibilityStatus === 'denied') {
permissions.askForAccessibilityAccess();
return wrapWithWarning(`##### WARNING! The application running this script tries to access accessibility features to execute ${functionName}! Please grant requested access and visit https://github.com/nut-tree/nut.js#macos for further information. #####`, nativeFunction);
}
}
const askForScreenRecording = (nativeFunction, functionName) => {
if (process.platform !== 'darwin') {
if (process.platform !== 'darwin' || hasScreenRecordingPermission) {
return nativeFunction;
}
const screenCaptureStatus = permissions.getAuthStatus("screen");

if (screenCaptureStatus === 'authorized') {
hasScreenRecordingPermission = true;
return nativeFunction;
} else if (screenCaptureStatus === 'not determined' || screenCaptureStatus === 'denied') {
permissions.askForScreenCaptureAccess();
Expand All @@ -42,11 +47,9 @@ try {
"mouseClick",
"mouseToggle",
"scrollMouse",
"setMouseDelay",
"keyTap",
"keyToggle",
"typeString",
"setKeyboardDelay",
"getScreenSize",
"highlight",
"captureScreen",
Expand All @@ -61,14 +64,17 @@ try {
];

for (const functionName of accessibilityAccess) {
libnut[functionName] = askForAccessibility(libnut[functionName], functionName);
const originalFunction = libnut[functionName];
libnut[functionName] = (...args) => askForAccessibility(originalFunction, functionName)(...args);
}
for (const functionName of screenCaptureAccess) {
libnut[functionName] = askForScreenRecording(libnut[functionName], functionName);
const originalFunction = libnut[functionName];
libnut[functionName] = (...args) => askForScreenRecording(originalFunction, functionName)(...args);
}
} catch (e) {
console.warn(`Encountered error establishing macOS permission checks:`, e.message);
console.warn(`Returning original module.`);
libnut = require("bindings")("libnut");
} finally {
module.exports = libnut;
}