Meet requirment of memory cage in recent Electron versions.

See https://github.com/nodejs/node-addon-api/releases/tag/v6.1.0 and electron/electron#35801 (comment).
raphaelmenges · May 13, 2023 · 14e54da · 14e54da
1 parent 369333e
commit 14e54da
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -19,6 +19,6 @@
   "devDependencies": {
     "@types/node": "18.13.0",
     "cmake-js": "7.2.0",
-    "node-addon-api": "6.0.0"
+    "node-addon-api": "6.1.0"
   }
 }
diff --git a/src/robotjs.cc b/src/robotjs.cc
@@ -1,4 +1,5 @@
 #define NAPI_VERSION 4
+#define NODE_API_NO_EXTERNAL_BUFFERS_ALLOWED // https://github.com/nodejs/node-addon-api/blob/main/doc/external_buffer.md
 #include <napi.h>
 #include <vector>
 #include "screen.h"
@@ -51,7 +52,7 @@ Napi::Value CaptureScreen(const Napi::CallbackInfo& info)
   MMBitmapRef bitmap = copyMMBitmapFromDisplayInRect(MMRectMake(x, y, w, h));
 
   uint32_t bufferSize = bitmap->bytewidth * bitmap->height;
-  auto buffer = Napi::Buffer<char>::New(info.Env(), (char*)bitmap->imageBuffer, bufferSize, myDestroyMMBitmapBuffer);
+  auto buffer = Napi::Buffer<char>::NewOrCopy(info.Env(), (char*)bitmap->imageBuffer, bufferSize, myDestroyMMBitmapBuffer);
 
   Napi::Object obj = Napi::Object::New(info.Env());
   obj.Set("width", bitmap->width);