macos-scroll-monitor 1.0.1 → 1.0.2

package/index.d.ts

@@ -26,7 +26,7 @@ export type ScrollCallback = (event: ScrollEvent) => void;
  * @param callback 每次滚动时触发的回调函数
  * @returns 启动成功返回 true，如果已在运行则返回 undefined 或 false
  */
-export function start(callback: ScrollCallback): boolean | undefined;
+export function start(callback: ScrollCallback): boolean;
 
 /**
  * 停止全局滚动监听并释放原生资源

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "macos-scroll-monitor",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "A native addon for Electron",
   "main": "index.js",
   "scripts": {

package/src/macos_scroll_monitor.mm

@@ -3,7 +3,6 @@
 
 class ScrollMonitor : public Napi::Addon<ScrollMonitor> {
 public:
-    // 构造函数：关联 JavaScript 方法与 C++ 实现
     ScrollMonitor(Napi::Env env, Napi::Object exports) {
         DefineAddon(exports, {
             InstanceMethod("start", &ScrollMonitor::Start),
@@ -12,86 +11,70 @@ public:
     }
 
 private:
-    id _eventMonitor = nil;             // 存储 macOS 原生监听器引用
-    Napi::ThreadSafeFunction _tsfn;     // 用于跨线程（系统事件线程 -> JS 线程）安全通信
+    id _globalMonitor = nil;
+    id _localMonitor = nil;
+    Napi::ThreadSafeFunction _tsfn;
 
-    // 内部结构体：封装需要传回 JS 的事件数据
     struct ScrollEventData {
         double deltaY;
-        bool command;
-        bool shift;
-        bool option;
-        bool ctrl;
-        bool fn;
+        bool command, shift, option, ctrl, fn;
     };
 
-    // 启动监听逻辑
+    // 内部通用的事件分发逻辑
+    void Dispatch(NSEvent* event) {
+        if (!_tsfn) return;
+
+        NSEventModifierFlags flags = [event modifierFlags];
+        ScrollEventData data;
+        data.deltaY = [event deltaY];
+        data.command = (flags & NSEventModifierFlagCommand) != 0;
+        data.shift = (flags & NSEventModifierFlagShift) != 0;
+        data.option = (flags & NSEventModifierFlagOption) != 0;
+        data.ctrl = (flags & NSEventModifierFlagControl) != 0;
+        data.fn = (flags & NSEventModifierFlagFunction) != 0;
+
+        _tsfn.BlockingCall([data](Napi::Env env, Napi::Function jsCallback) {
+            Napi::Object obj = Napi::Object::New(env);
+            obj.Set("deltaY", Napi::Number::New(env, data.deltaY));
+            obj.Set("command", Napi::Boolean::New(env, data.command));
+            obj.Set("shift", Napi::Boolean::New(env, data.shift));
+            obj.Set("option", Napi::Boolean::New(env, data.option));
+            obj.Set("ctrl", Napi::Boolean::New(env, data.ctrl));
+            obj.Set("fn", Napi::Boolean::New(env, data.fn));
+            jsCallback.Call({ obj });
+        });
+    }
+
     Napi::Value Start(const Napi::CallbackInfo& info) {
         Napi::Env env = info.Env();
-        
-        // 防护逻辑：避免重复启动导致内存泄漏或多次监听
-        if (_eventMonitor != nil || _tsfn) return env.Undefined();
-
-        // 验证参数：确保第一个参数是回调函数
-        if (info.Length() < 1 || !info[0].IsFunction()) {
-            Napi::TypeError::New(env, "Callback function expected").ThrowAsJavaScriptException();
-            return env.Undefined();
-        }
+        if (_globalMonitor || _localMonitor || _tsfn) return Napi::Boolean::New(env, false);
 
         Napi::Function cb = info[0].As<Napi::Function>();
-        
-        // 创建线程安全函数。Resource Name 设为 MacOSGlobalScrollMonitor 方便调试
         _tsfn = Napi::ThreadSafeFunction::New(env, cb, "MacOSGlobalScrollMonitor", 0, 1);
 
-        // 调用 AppKit API 添加全局滚动监控
-        _eventMonitor = [NSEvent addGlobalMonitorForEventsMatchingMask:NSEventMaskScrollWheel
+        // 1. 监听外部窗口（Global）
+        _globalMonitor = [NSEvent addGlobalMonitorForEventsMatchingMask:NSEventMaskScrollWheel
                                                               handler:^(NSEvent* event) {
-            // 获取修饰键掩码
-            NSEventModifierFlags flags = [event modifierFlags];
-            
-            // 填充数据结构
-            ScrollEventData data;
-            data.deltaY = [event deltaY];
-            data.command = (flags & NSEventModifierFlagCommand) != 0;
-            data.shift = (flags & NSEventModifierFlagShift) != 0;
-            data.option = (flags & NSEventModifierFlagOption) != 0;
-            data.ctrl = (flags & NSEventModifierFlagControl) != 0;
-            data.fn = (flags & NSEventModifierFlagFunction) != 0; // 原生支持 fn 键监测
+            Dispatch(event);
+        }];
 
-            // 将数据异步推送到 Node.js 主线程
-            _tsfn.BlockingCall([data](Napi::Env env, Napi::Function jsCallback) {
-                Napi::Object obj = Napi::Object::New(env);
-                obj.Set("deltaY", Napi::Number::New(env, data.deltaY));
-                obj.Set("command", Napi::Boolean::New(env, data.command));
-                obj.Set("shift", Napi::Boolean::New(env, data.shift));
-                obj.Set("option", Napi::Boolean::New(env, data.option));
-                obj.Set("ctrl", Napi::Boolean::New(env, data.ctrl));
-                obj.Set("fn", Napi::Boolean::New(env, data.fn));
-                
-                jsCallback.Call({ obj });
-            });
+        // 2. 监听自身窗口（Local）
+        // 因为不需要穿透，我们在这里依然处理逻辑，并返回 event 确保窗口内 UI 响应正常
+        _localMonitor = [NSEvent addLocalMonitorForEventsMatchingMask:NSEventMaskScrollWheel
+                                                                    handler:^NSEvent*(NSEvent* event) {
+            Dispatch(event);
+            return event; 
         }];
 
         return Napi::Boolean::New(env, true);
     }
 
-    // 停止监听逻辑
     Napi::Value Stop(const Napi::CallbackInfo& info) {
-        // 移除 macOS 系统级监听器
-        if (_eventMonitor != nil) {
-            [NSEvent removeMonitor:_eventMonitor];
-            _eventMonitor = nil;
-        }
-
-        // 安全释放线程安全函数，并显式置空
-        if (_tsfn) {
-            _tsfn.Release();
-            _tsfn = nullptr;
-        }
-        
+        if (_globalMonitor) { [NSEvent removeMonitor:_globalMonitor]; _globalMonitor = nil; }
+        if (_localMonitor) { [NSEvent removeMonitor:_localMonitor]; _localMonitor = nil; }
+        if (_tsfn) { _tsfn.Release(); _tsfn = nullptr; }
         return info.Env().Undefined();
     }
 };
 
-// 导出插件，类名为 ScrollMonitor
 NODE_API_ADDON(ScrollMonitor)