simen-keyboard-listener 1.1.3 → 1.1.5

package/README.md

@@ -13,9 +13,7 @@ The package uses `optionalDependencies` to automatically install the correct nat
 | Package | Platform |
 |---------|----------|
 | `@simen-keyboard-listener/darwin-arm64` | macOS Apple Silicon |
-| `@simen-keyboard-listener/darwin-x64` | macOS Intel |
 | `@simen-keyboard-listener/win32-x64` | Windows x64 |
-| `@simen-keyboard-listener/win32-arm64` | Windows ARM64 |
 
 ### For Electron/Bundler Projects
 
@@ -37,9 +35,7 @@ If you're using webpack, electron-builder, or other bundlers, you may need to co
 module.exports = {
   externals: {
     '@simen-keyboard-listener/darwin-arm64': 'commonjs @simen-keyboard-listener/darwin-arm64',
-    '@simen-keyboard-listener/darwin-x64': 'commonjs @simen-keyboard-listener/darwin-x64',
     '@simen-keyboard-listener/win32-x64': 'commonjs @simen-keyboard-listener/win32-x64',
-    '@simen-keyboard-listener/win32-arm64': 'commonjs @simen-keyboard-listener/win32-arm64',
   }
 };
 ```
@@ -59,6 +55,75 @@ listener.addListener((event, isDown) => {
 listener.removeListener(myListener);
 ```
 
+## 开发与构建
+
+### 构建原生模块
+
+本项目包含 C++ 和 Swift 原生代码，需要编译为平台特定的二进制文件。构建脚本会自动处理编译和文件复制。
+
+#### 一键构建（推荐）
+
+自动检测当前平台并构建：
+
+```bash
+npm run prebuild
+```
+
+此命令会：
+- 自动检测当前操作系统和架构
+- macOS：编译 Swift 辅助文件 + 构建原生模块 + 复制到 `packages/darwin-arm64/`
+- Windows：构建原生模块 + 复制到 `packages/win32-x64/`
+
+#### 手动指定平台构建
+
+**Windows 平台：**
+```bash
+npm run prebuild:win
+```
+
+**macOS 平台：**
+```bash
+npm run prebuild:mac
+```
+
+#### 仅复制已构建的文件
+
+如果已经构建完成，只需要复制文件到 packages 目录：
+
+```bash
+npm run copy-native win32-x64    # Windows
+npm run copy-native darwin-arm64 # macOS
+```
+
+#### 完整构建流程
+
+如果需要构建 TypeScript 代码和原生模块：
+
+```bash
+npm run build
+```
+
+这会执行：
+1. 编译 Swift 文件（macOS）
+2. 构建原生模块（node-gyp）
+3. 编译 TypeScript 代码
+
+### 发布流程
+
+发布所有平台包到 npm：
+
+```bash
+npm run publish:all
+```
+
+发布脚本会：
+1. 同步所有平台包的版本号
+2. 检查 `.node` 文件是否存在
+3. 依次发布各平台包
+4. 最后发布主包
+
+**注意：** 发布前需要确保所有平台的 `.node` 文件都已构建并复制到对应的 `packages/` 目录。
+
 ## API
 
 ### `getGlobalKeyboardListener(): IGlobalKeyboardListener`
@@ -91,8 +156,8 @@ interface IGlobalKeyEvent {
 
 ## Platform Support
 
-- macOS (x64, arm64)
-- Windows (x64, arm64)
+- macOS ARM64 (Apple Silicon)
+- Windows x64
 
 ## Requirements
 

package/dist/index.d.mts

@@ -49,5 +49,20 @@ declare function getContextJSON(): string | null;
  * @returns 选中文本或 null
  */
 declare function getSelectedTextSmart(): string | null;
+/**
+ * Set whether to block ALL system hotkeys involving modifier key combinations.
+ * This covers: Shift+Alt (IME switch), Ctrl+Shift (IME switch), Win+Space (IME switch),
+ * Alt release (menu activation), Win release (Start menu), etc.
+ *
+ * When enabled:
+ *   - On modifier key DOWN with another modifier held: inject F13 to break system hotkey detection
+ *   - On Alt release: inject F13 to prevent menu activation
+ *   - On Win release: inject Shift+Win sequence to prevent Start menu
+ *
+ * Windows only - no-op on other platforms.
+ *
+ * @param block true = block all system hotkeys, false = allow normal behavior
+ */
+declare function setBlockSystemHotkeys(block: boolean): void;
 
-export { type IGlobalKeyDownMap, type IGlobalKeyEvent, type IGlobalKeyListener, type IGlobalKeyState, type IGlobalKeyboardListener, type IPermissionLostListener, checkKeyboardPermission, createGlobalKeyboardListener, getContextJSON, getFocusedInputSelectedText, getFocusedInputValue, getGlobalKeyboardListener, getSelectedTextSmart };
+export { type IGlobalKeyDownMap, type IGlobalKeyEvent, type IGlobalKeyListener, type IGlobalKeyState, type IGlobalKeyboardListener, type IPermissionLostListener, checkKeyboardPermission, createGlobalKeyboardListener, getContextJSON, getFocusedInputSelectedText, getFocusedInputValue, getGlobalKeyboardListener, getSelectedTextSmart, setBlockSystemHotkeys };

package/dist/index.d.ts

@@ -49,5 +49,20 @@ declare function getContextJSON(): string | null;
  * @returns 选中文本或 null
  */
 declare function getSelectedTextSmart(): string | null;
+/**
+ * Set whether to block ALL system hotkeys involving modifier key combinations.
+ * This covers: Shift+Alt (IME switch), Ctrl+Shift (IME switch), Win+Space (IME switch),
+ * Alt release (menu activation), Win release (Start menu), etc.
+ *
+ * When enabled:
+ *   - On modifier key DOWN with another modifier held: inject F13 to break system hotkey detection
+ *   - On Alt release: inject F13 to prevent menu activation
+ *   - On Win release: inject Shift+Win sequence to prevent Start menu
+ *
+ * Windows only - no-op on other platforms.
+ *
+ * @param block true = block all system hotkeys, false = allow normal behavior
+ */
+declare function setBlockSystemHotkeys(block: boolean): void;
 
-export { type IGlobalKeyDownMap, type IGlobalKeyEvent, type IGlobalKeyListener, type IGlobalKeyState, type IGlobalKeyboardListener, type IPermissionLostListener, checkKeyboardPermission, createGlobalKeyboardListener, getContextJSON, getFocusedInputSelectedText, getFocusedInputValue, getGlobalKeyboardListener, getSelectedTextSmart };
+export { type IGlobalKeyDownMap, type IGlobalKeyEvent, type IGlobalKeyListener, type IGlobalKeyState, type IGlobalKeyboardListener, type IPermissionLostListener, checkKeyboardPermission, createGlobalKeyboardListener, getContextJSON, getFocusedInputSelectedText, getFocusedInputValue, getGlobalKeyboardListener, getSelectedTextSmart, setBlockSystemHotkeys };

package/dist/index.js

@@ -36,7 +36,8 @@ __export(index_exports, {
   getFocusedInputSelectedText: () => getFocusedInputSelectedText,
   getFocusedInputValue: () => getFocusedInputValue,
   getGlobalKeyboardListener: () => getGlobalKeyboardListener,
-  getSelectedTextSmart: () => getSelectedTextSmart
+  getSelectedTextSmart: () => getSelectedTextSmart,
+  setBlockSystemHotkeys: () => setBlockSystemHotkeys
 });
 module.exports = __toCommonJS(index_exports);
 var path = __toESM(require("path"));
@@ -45,6 +46,8 @@ var import_node_child_process = require("child_process");
 var import_node_module = require("module");
 var import_url = require("url");
 var import_meta = {};
+var IS_MACOS = process.platform === "darwin";
+var IS_WINDOWS = process.platform === "win32";
 var PLATFORM_PACKAGES = {
   "darwin-arm64": "@simen-keyboard-listener/darwin-arm64",
   "win32-x64": "@simen-keyboard-listener/win32-x64"
@@ -79,7 +82,9 @@ function getNativeAddon() {
   if (packageName) {
     try {
       const candidate = localRequire(packageName);
-      if (candidate && typeof candidate.start === "function" && typeof candidate.stop === "function" && typeof candidate.isRunning === "function" && typeof candidate.checkPermission === "function" && typeof candidate.getFocusedInputValue === "function" && typeof candidate.getFocusedInputSelectedText === "function") {
+      const hasCoreFunctions = candidate && typeof candidate.start === "function" && typeof candidate.stop === "function" && typeof candidate.isRunning === "function" && typeof candidate.checkPermission === "function";
+      const hasMacOSFunctions = IS_MACOS ? typeof candidate.getFocusedInputValue === "function" && typeof candidate.getFocusedInputSelectedText === "function" : true;
+      if (hasCoreFunctions && hasMacOSFunctions) {
         nativeAddon = candidate;
         return nativeAddon;
       }
@@ -195,7 +200,7 @@ var NativeKeyboardListener = class _NativeKeyboardListener {
   }
 };
 function getGlobalKeyboardListener() {
-  if (process.platform !== "darwin" && process.platform !== "win32") {
+  if (!IS_MACOS && !IS_WINDOWS) {
     throw new Error(`Unsupported platform for global keyboard listener: ${process.platform}`);
   }
   return NativeKeyboardListener.getInstance();
@@ -204,7 +209,7 @@ function createGlobalKeyboardListener() {
   return getGlobalKeyboardListener();
 }
 function checkKeyboardPermission() {
-  if (process.platform !== "darwin" && process.platform !== "win32") {
+  if (!IS_MACOS && !IS_WINDOWS) {
     return false;
   }
   try {
@@ -216,7 +221,7 @@ function checkKeyboardPermission() {
 }
 var lastMacAccessibilitySettingsOpenTs = 0;
 function openMacAccessibilitySettings() {
-  if (process.platform !== "darwin") {
+  if (!IS_MACOS) {
     return;
   }
   const now = Date.now();
@@ -242,7 +247,7 @@ function ensureAccessibilityPermission(addon) {
   return false;
 }
 function getFocusedInputValue() {
-  if (process.platform !== "darwin") {
+  if (!IS_MACOS) {
     return null;
   }
   const addon = getNativeAddon();
@@ -256,7 +261,7 @@ function getFocusedInputValue() {
   }
 }
 function getFocusedInputSelectedText() {
-  if (process.platform !== "darwin") {
+  if (!IS_MACOS) {
     return null;
   }
   const addon = getNativeAddon();
@@ -270,7 +275,7 @@ function getFocusedInputSelectedText() {
   }
 }
 function getContextJSON() {
-  if (process.platform !== "darwin") return null;
+  if (!IS_MACOS) return null;
   const addon = getNativeAddon();
   if (!ensureAccessibilityPermission(addon)) return null;
   try {
@@ -280,7 +285,7 @@ function getContextJSON() {
   }
 }
 function getSelectedTextSmart() {
-  if (process.platform !== "darwin") return null;
+  if (!IS_MACOS) return null;
   const addon = getNativeAddon();
   if (!ensureAccessibilityPermission(addon)) return null;
   try {
@@ -289,6 +294,16 @@ function getSelectedTextSmart() {
     return null;
   }
 }
+function setBlockSystemHotkeys(block) {
+  if (!IS_WINDOWS) {
+    return;
+  }
+  try {
+    const addon = getNativeAddon();
+    addon.setBlockSystemHotkeys?.(block);
+  } catch {
+  }
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkKeyboardPermission,
@@ -297,5 +312,6 @@ function getSelectedTextSmart() {
   getFocusedInputSelectedText,
   getFocusedInputValue,
   getGlobalKeyboardListener,
-  getSelectedTextSmart
+  getSelectedTextSmart,
+  setBlockSystemHotkeys
 });

package/dist/index.mjs

@@ -11,6 +11,8 @@ import * as fs from "fs";
 import { execFileSync } from "child_process";
 import { createRequire } from "module";
 import { fileURLToPath } from "url";
+var IS_MACOS = process.platform === "darwin";
+var IS_WINDOWS = process.platform === "win32";
 var PLATFORM_PACKAGES = {
   "darwin-arm64": "@simen-keyboard-listener/darwin-arm64",
   "win32-x64": "@simen-keyboard-listener/win32-x64"
@@ -45,7 +47,9 @@ function getNativeAddon() {
   if (packageName) {
     try {
       const candidate = localRequire(packageName);
-      if (candidate && typeof candidate.start === "function" && typeof candidate.stop === "function" && typeof candidate.isRunning === "function" && typeof candidate.checkPermission === "function" && typeof candidate.getFocusedInputValue === "function" && typeof candidate.getFocusedInputSelectedText === "function") {
+      const hasCoreFunctions = candidate && typeof candidate.start === "function" && typeof candidate.stop === "function" && typeof candidate.isRunning === "function" && typeof candidate.checkPermission === "function";
+      const hasMacOSFunctions = IS_MACOS ? typeof candidate.getFocusedInputValue === "function" && typeof candidate.getFocusedInputSelectedText === "function" : true;
+      if (hasCoreFunctions && hasMacOSFunctions) {
         nativeAddon = candidate;
         return nativeAddon;
       }
@@ -161,7 +165,7 @@ var NativeKeyboardListener = class _NativeKeyboardListener {
   }
 };
 function getGlobalKeyboardListener() {
-  if (process.platform !== "darwin" && process.platform !== "win32") {
+  if (!IS_MACOS && !IS_WINDOWS) {
     throw new Error(`Unsupported platform for global keyboard listener: ${process.platform}`);
   }
   return NativeKeyboardListener.getInstance();
@@ -170,7 +174,7 @@ function createGlobalKeyboardListener() {
   return getGlobalKeyboardListener();
 }
 function checkKeyboardPermission() {
-  if (process.platform !== "darwin" && process.platform !== "win32") {
+  if (!IS_MACOS && !IS_WINDOWS) {
     return false;
   }
   try {
@@ -182,7 +186,7 @@ function checkKeyboardPermission() {
 }
 var lastMacAccessibilitySettingsOpenTs = 0;
 function openMacAccessibilitySettings() {
-  if (process.platform !== "darwin") {
+  if (!IS_MACOS) {
     return;
   }
   const now = Date.now();
@@ -208,7 +212,7 @@ function ensureAccessibilityPermission(addon) {
   return false;
 }
 function getFocusedInputValue() {
-  if (process.platform !== "darwin") {
+  if (!IS_MACOS) {
     return null;
   }
   const addon = getNativeAddon();
@@ -222,7 +226,7 @@ function getFocusedInputValue() {
   }
 }
 function getFocusedInputSelectedText() {
-  if (process.platform !== "darwin") {
+  if (!IS_MACOS) {
     return null;
   }
   const addon = getNativeAddon();
@@ -236,7 +240,7 @@ function getFocusedInputSelectedText() {
   }
 }
 function getContextJSON() {
-  if (process.platform !== "darwin") return null;
+  if (!IS_MACOS) return null;
   const addon = getNativeAddon();
   if (!ensureAccessibilityPermission(addon)) return null;
   try {
@@ -246,7 +250,7 @@ function getContextJSON() {
   }
 }
 function getSelectedTextSmart() {
-  if (process.platform !== "darwin") return null;
+  if (!IS_MACOS) return null;
   const addon = getNativeAddon();
   if (!ensureAccessibilityPermission(addon)) return null;
   try {
@@ -255,6 +259,16 @@ function getSelectedTextSmart() {
     return null;
   }
 }
+function setBlockSystemHotkeys(block) {
+  if (!IS_WINDOWS) {
+    return;
+  }
+  try {
+    const addon = getNativeAddon();
+    addon.setBlockSystemHotkeys?.(block);
+  } catch {
+  }
+}
 export {
   checkKeyboardPermission,
   createGlobalKeyboardListener,
@@ -262,5 +276,6 @@ export {
   getFocusedInputSelectedText,
   getFocusedInputValue,
   getGlobalKeyboardListener,
-  getSelectedTextSmart
+  getSelectedTextSmart,
+  setBlockSystemHotkeys
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "simen-keyboard-listener",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "description": "Native global keyboard listener for macOS and Windows",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -20,7 +20,10 @@
     "build:native": "npm run build:swift && node-gyp rebuild --directory=src/native",
     "build:ts": "tsup src/index.ts --format cjs,esm --dts --clean",
     "build": "npm run build:native && npm run build:ts",
-    "prebuild": "npm run build:swift && prebuildify --napi --strip --cwd src/native --out ../../prebuilds",
+    "prebuild": "node scripts/prebuild-current.js",
+    "prebuild:win": "npx node-gyp rebuild --directory=src/native && node scripts/copy-native.js win32-x64",
+    "prebuild:mac": "npm run build:swift && npx node-gyp rebuild --directory=src/native && node scripts/copy-native.js darwin-arm64",
+    "copy-native": "node scripts/copy-native.js",
     "prepublishOnly": "npm run build:ts",
     "publish:all": "node scripts/publish.js"
   },
@@ -46,8 +49,8 @@
     "node-addon-api": "^8.0.0"
   },
   "optionalDependencies": {
-    "@simen-keyboard-listener/darwin-arm64": "1.1.3",
-    "@simen-keyboard-listener/win32-x64": "1.1.3"
+    "@simen-keyboard-listener/darwin-arm64": "1.1.5",
+    "@simen-keyboard-listener/win32-x64": "1.1.5"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",