Update package.json

fix #448

.github/workflows/main.yml

@@ -23,7 +23,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, windows-2019, ubuntu-latest]
+        os: [macos-latest, windows-2022, ubuntu-latest]
 
     # create steps
     steps:

README.md

@@ -1,36 +1,22 @@
 English | [简体中文](./README.zh-CN.md)
 
-
 <div align= "center">
 <img align="center" width=200 src="./public/logo.png" />
 </div>
 
-
-<div align= "center">
- <h1>Rubick</h1>
-
- <img alt="release" src="https://img.shields.io/github/downloads/rubickCenter/rubick/total" />
- <a href="https://github.com/rubickCenter/rubick/releases">
-    <img alt="release" src="https://img.shields.io/github/package-json/v/rubickCenter/rubick" />
- </a>
- <a href="https://github.com/rubickCenter/rubick/actions">
-   <img alt=building src=https://img.shields.io/github/actions/workflow/status/rubickCenter/rubick/main.yml>
- </a>
- <a href="https://github.com/rubickCenter/rubick/blob/master/LICENSE">
-    <img alt="npm" src="https://img.shields.io/github/license/rubickCenter/rubick" />
- </a>
- <a href="https://github.com/rubickCenter/rubick/stargazers">
-    <img alt="star" src="https://img.shields.io/github/stars/rubickCenter/rubick?style=social">
-</a>
-<a href="https://gitee.com/monkeyWang/rubick">
-    <img alt="码云" src="https://img.shields.io/badge/Gitee--yellow.svg?style=social&logo=data:image/svg+xml;base64,PHN2ZyB0PSIxNTc0ODM3MTM4ODM3IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjE3NzAiICAgICB3aWR0aD0iMTYiIGhlaWdodD0iMTYiPiAgICA8cGF0aCBkPSJNODkxIDQyOC44SDQ2NS44Yy0yMC40IDAtMzcgMTYuNS0zNyAzN3Y5Mi40YzAgMjAuNCAxNi41IDM3IDM3IDM3aDI1OC45YzIwLjQgMCAzNyAxNi42IDM3IDM3djE4LjRjMCA2MS4zLTQ5LjcgMTEwLjktMTEwLjkgMTEwLjlIMjk5LjRjLTIwLjQgMC0zNy0xNi42LTM3LTM3VjM3My4yYzAtNjEuMyA0OS43LTExMC45IDExMC45LTExMC45aDUxNy42YzIwLjQgMCAzNy0xNi41IDM3LTM3bDAuMS05Mi4zYzAtMjAuNC0xNi41LTM3LTM3LTM3SDM3My4zQzIyMC4yIDk2IDk2IDIyMC4yIDk2IDM3My4zVjg5MWMwIDIwLjQgMTYuNiAzNyAzNyAzN2g1NDUuNEM4MTYuMiA5MjggOTI4IDgxNi4zIDkyOCA2NzguNFY0NjUuOGMwLTIwLjQtMTYuNi0zNy0zNy0zN3oiICAgICAgICAgIGZpbGw9IiNkODFlMDYiIHAtaWQ9IjE3NzEiPjwvcGF0aD48L3N2Zz4="/>
-</a>
+<div align="center">
+    <h1>Rubick</h1>
+    <img alt="downloads" src="https://img.shields.io/github/downloads/rubickCenter/rubick/total" />
+    <a href="https://github.com/rubickCenter/rubick/releases"><img alt="latest release" src="https://img.shields.io/github/package-json/v/rubickCenter/rubick" /></a>
+    <a href="https://github.com/rubickCenter/rubick/actions"><img alt="github action building" src="https://img.shields.io/github/actions/workflow/status/rubickCenter/rubick/main.yml" /></a>
+    <a href="https://github.com/rubickCenter/rubick/blob/master/LICENSE"><img alt="license" src="https://img.shields.io/github/license/rubickCenter/rubick" /></a>
+    <a href="https://github.com/rubickCenter/rubick/stargazers"><img alt="github stars" src="https://img.shields.io/github/stars/rubickCenter/rubick?style=social" /></a>
+    <a href="https://gitee.com/monkeyWang/rubick"><img alt="gitee mirror" src="https://img.shields.io/badge/Gitee--yellow.svg?style=social&logo=data:image/svg+xml;base64,PHN2ZyB0PSIxNTc0ODM3MTM4ODM3IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjE3NzAiICAgICB3aWR0aD0iMTYiIGhlaWdodD0iMTYiPiAgICA8cGF0aCBkPSJNODkxIDQyOC44SDQ2NS44Yy0yMC40IDAtMzcgMTYuNS0zNyAzN3Y5Mi40YzAgMjAuNCAxNi41IDM3IDM3IDM3aDI1OC45YzIwLjQgMCAzNyAxNi42IDM3IDM3djE4LjRjMCA2MS4zLTQ5LjcgMTEwLjktMTEwLjkgMTEwLjlIMjk5LjRjLTIwLjQgMC0zNy0xNi42LTM3LTM3VjM3My4yYzAtNjEuMyA0OS43LTExMC45IDExMC45LTExMC45aDUxNy42YzIwLjQgMCAzNy0xNi41IDM3LTM3bDAuMS05Mi4zYzAtMjAuNC0xNi41LTM3LTM3LTM3SDM3My4zQzIyMC4yIDk2IDk2IDIyMC4yIDk2IDM3My4zVjg5MWMwIDIwLjQgMTYuNiAzNyAzNyAzN2g1NDUuNEM4MTYuMiA5MjggOTI4IDgxNi4zIDkyOCA2NzguNFY0NjUuOGMwLTIwLjQtMTYuNi0zNy0zNy0zN3oiICAgICAgICAgIGZpbGw9IiNkODFlMDYiIHAtaWQ9IjE3NzEiPjwvcGF0aD48L3N2Zz4=" /></a>
 </div>
 
 <div align= "center">
 <img align="center" src="https://picx.zhimg.com/80/v2-f8fe09ef125dac5fdcbef3fe00f92b21_720w.png" />
 </div>
-
 Open-source plugin-based desktop efficiency toolbox. The plugins are installed and uninstalled based on npm, which is very lightweight. The plugin data supports webdav multi-terminal synchronization, which is very secure. It supports internal network deployment and can be customized for further development, which is very flexible.
 
 ## Get Rubick

README.zh-CN.md

@@ -5,25 +5,14 @@
 <img align="center" width=200 src="./public/logo.png" />
 </div>
 
-<div align= "center">
- <h1>Rubick</h1>
-
- <img alt="release" src="https://img.shields.io/github/downloads/rubickCenter/rubick/total" />
- <a href="https://github.com/rubickCenter/rubick/releases">
-    <img alt="release" src="https://img.shields.io/github/package-json/v/rubickCenter/rubick" />
- </a>
- <a href="https://github.com/rubickCenter/rubick/actions">
-   <img alt=building src=https://img.shields.io/github/actions/workflow/status/rubickCenter/rubick/main.yml>
- </a>
- <a href="https://github.com/rubickCenter/rubick/blob/master/LICENSE">
-    <img alt="npm" src="https://img.shields.io/github/license/rubickCenter/rubick" />
- </a>
- <a href="https://github.com/rubickCenter/rubick/stargazers">
-    <img alt="star" src="https://img.shields.io/github/stars/rubickCenter/rubick?style=social">
-</a>
-<a href="https://gitee.com/monkeyWang/rubick">
-    <img alt="码云" src="https://img.shields.io/badge/Gitee--yellow.svg?style=social&logo=data:image/svg+xml;base64,PHN2ZyB0PSIxNTc0ODM3MTM4ODM3IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjE3NzAiICAgICB3aWR0aD0iMTYiIGhlaWdodD0iMTYiPiAgICA8cGF0aCBkPSJNODkxIDQyOC44SDQ2NS44Yy0yMC40IDAtMzcgMTYuNS0zNyAzN3Y5Mi40YzAgMjAuNCAxNi41IDM3IDM3IDM3aDI1OC45YzIwLjQgMCAzNyAxNi42IDM3IDM3djE4LjRjMCA2MS4zLTQ5LjcgMTEwLjktMTEwLjkgMTEwLjlIMjk5LjRjLTIwLjQgMC0zNy0xNi42LTM3LTM3VjM3My4yYzAtNjEuMyA0OS43LTExMC45IDExMC45LTExMC45aDUxNy42YzIwLjQgMCAzNy0xNi41IDM3LTM3bDAuMS05Mi4zYzAtMjAuNC0xNi41LTM3LTM3LTM3SDM3My4zQzIyMC4yIDk2IDk2IDIyMC4yIDk2IDM3My4zVjg5MWMwIDIwLjQgMTYuNiAzNyAzNyAzN2g1NDUuNEM4MTYuMiA5MjggOTI4IDgxNi4zIDkyOCA2NzguNFY0NjUuOGMwLTIwLjQtMTYuNi0zNy0zNy0zN3oiICAgICAgICAgIGZpbGw9IiNkODFlMDYiIHAtaWQ9IjE3NzEiPjwvcGF0aD48L3N2Zz4="/>
-</a>
+<div align="center">
+    <h1>Rubick</h1>
+    <img alt="累计下载数" src="https://img.shields.io/github/downloads/rubickCenter/rubick/total" />
+    <a href="https://github.com/rubickCenter/rubick/releases"><img alt="最新发布版本" src="https://img.shields.io/github/package-json/v/rubickCenter/rubick" /></a>
+    <a href="https://github.com/rubickCenter/rubick/actions"><img alt="github action 构建" src="https://img.shields.io/github/actions/workflow/status/rubickCenter/rubick/main.yml" /></a>
+    <a href="https://github.com/rubickCenter/rubick/blob/master/LICENSE"><img alt="许可证" src="https://img.shields.io/github/license/rubickCenter/rubick" /></a>
+    <a href="https://github.com/rubickCenter/rubick/stargazers"><img alt="github 收藏数" src="https://img.shields.io/github/stars/rubickCenter/rubick?style=social" /></a>
+    <a href="https://gitee.com/monkeyWang/rubick"><img alt="gitee 镜像源" src="https://img.shields.io/badge/Gitee--yellow.svg?style=social&logo=data:image/svg+xml;base64,PHN2ZyB0PSIxNTc0ODM3MTM4ODM3IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjE3NzAiICAgICB3aWR0aD0iMTYiIGhlaWdodD0iMTYiPiAgICA8cGF0aCBkPSJNODkxIDQyOC44SDQ2NS44Yy0yMC40IDAtMzcgMTYuNS0zNyAzN3Y5Mi40YzAgMjAuNCAxNi41IDM3IDM3IDM3aDI1OC45YzIwLjQgMCAzNyAxNi42IDM3IDM3djE4LjRjMCA2MS4zLTQ5LjcgMTEwLjktMTEwLjkgMTEwLjlIMjk5LjRjLTIwLjQgMC0zNy0xNi42LTM3LTM3VjM3My4yYzAtNjEuMyA0OS43LTExMC45IDExMC45LTExMC45aDUxNy42YzIwLjQgMCAzNy0xNi41IDM3LTM3bDAuMS05Mi4zYzAtMjAuNC0xNi41LTM3LTM3LTM3SDM3My4zQzIyMC4yIDk2IDk2IDIyMC4yIDk2IDM3My4zVjg5MWMwIDIwLjQgMTYuNiAzNyAzNyAzN2g1NDUuNEM4MTYuMiA5MjggOTI4IDgxNi4zIDkyOCA2NzguNFY0NjUuOGMwLTIwLjQtMTYuNi0zNy0zNy0zN3oiICAgICAgICAgIGZpbGw9IiNkODFlMDYiIHAtaWQ9IjE3NzEiPjwvcGF0aD48L3N2Zz4=" /></a>
 </div>
 
 <div align= "center">

feature/src/views/settings/index.vue

@@ -274,12 +274,16 @@ const state = reactive({
   custom: {},
 });
 
+// 添加lastKeyPressTime变量来跟踪按键时间
+const lastKeyPressTime = ref(0);
+const DOUBLE_CLICK_THRESHOLD = 300; // 双击时间阈值（毫秒）
+
 const isWindows = window?.rubick?.isWindows();
 const tipText = computed(() => {
   const optionKeyName = isWindows ? 'Alt' : 'Option、Command';
   return t('feature.settings.global.addShortcutKeyTips', {
     optionKeyName: optionKeyName,
-  });
+  }) + `此外你也可以双击修饰键如（Ctrl+Ctrl）`;
 });
 
 const currentSelect = ref(['userInfo']);
@@ -314,33 +318,60 @@ watch(state, setConfig);
 
 const changeShortCut = (e, key) => {
   let compose = '';
-  // 添加是否包含功能键的判断
-  let incluFuncKeys = false;
+  const currentTime = Date.now();
+  const isDoubleClick = currentTime - lastKeyPressTime.value < DOUBLE_CLICK_THRESHOLD;
+  lastKeyPressTime.value = currentTime;
+
+  // 处理 F1-F12 功能键
+  if (e.keyCode >= 112 && e.keyCode <= 123) {
+    state.shortCut[key] = keycodes[e.keyCode].toUpperCase();
+    return;
+  }
+
+  // 处理双击功能键的情况
+  if (isDoubleClick) {
+    if (e.keyCode === 17) { // Ctrl
+      state.shortCut[key] = 'Ctrl+Ctrl';
+      return;
+    }
+    if (e.keyCode === 18) { // Alt
+      state.shortCut[key] = 'Option+Option';
+      return;
+    }
+    if (e.keyCode === 16) { // Shift
+      state.shortCut[key] = 'Shift+Shift';
+      return;
+    }
+    if (e.keyCode === 93) { // Command
+      state.shortCut[key] = 'Command+Command';
+      return;
+    }
+  }
+
+  // 处理功能键+普通键的组合
+  let hasModifierKey = false;
+  
   if (e.ctrlKey && e.keyCode !== 17) {
     compose += '+Ctrl';
-    incluFuncKeys = true;
+    hasModifierKey = true;
   }
   if (e.shiftKey && e.keyCode !== 16) {
     compose += '+Shift';
-    incluFuncKeys = true;
+    hasModifierKey = true;
   }
   if (e.altKey && e.keyCode !== 18) {
     compose += '+Option';
-    incluFuncKeys = true;
+    hasModifierKey = true;
   }
   if (e.metaKey && e.keyCode !== 93) {
     compose += '+Command';
-    incluFuncKeys = true;
+    hasModifierKey = true;
   }
-  compose += '+' + keycodes[e.keyCode].toUpperCase();
-  compose = compose.substring(1);
-  if (
-    incluFuncKeys &&
-    e.keyCode !== 16 &&
-    e.keyCode !== 17 &&
-    e.keyCode !== 18 &&
-    e.keyCode !== 93
-  ) {
+
+  // 只有当有修饰键时才添加普通键
+  if (hasModifierKey) {
+    compose += '+' + keycodes[e.keyCode].toUpperCase();
+    compose = compose.substring(1);
     state.shortCut[key] = compose;
   } else {
     // 不做处理

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rubick",
-  "version": "4.3.2",
+  "version": "4.3.5",
   "author": "muwoo <2424880409@qq.com>",
   "private": true,
   "scripts": {
@@ -39,6 +39,7 @@
     "pouchdb-load": "^1.4.6",
     "pouchdb-replication-stream": "^1.2.9",
     "simple-plist": "0.2.1",
+    "uiohook-napi": "^1.5.4",
     "vue": "^3.0.0",
     "vue-router": "^4.0.0-0",
     "vuex": "^4.0.0-0",

src/common/constans/renderer.ts

@@ -4,6 +4,6 @@ import path from 'path';
 const appPath = app.getPath('userData');
 
 const PLUGIN_INSTALL_DIR = path.join(appPath, './rubick-plugins-new');
-const PLUGIN_HISTORY = 'rubick-local-start-app';
+const PLUGIN_HISTORY = 'rubick-plugin-history';
 
 export { PLUGIN_INSTALL_DIR, PLUGIN_HISTORY };

src/main/common/registerHotKey.ts

@@ -10,6 +10,7 @@ import {
 import screenCapture from '@/core/screen-capture';
 import localConfig from '@/main/common/initLocalConfig';
 import winPosition from './getWinPosition';
+import { uIOhook, UiohookKey } from 'uiohook-napi';
 
 const registerHotKey = (mainWindow: BrowserWindow): void => {
   // 设置开机启动
@@ -57,27 +58,43 @@ const registerHotKey = (mainWindow: BrowserWindow): void => {
     }
   };
 
+  // 显示主窗口
+  function mainWindowPopUp() {
+    const currentShow = mainWindow.isVisible() && mainWindow.isFocused();
+    if (currentShow) return mainWindow.hide();
+    const { x: wx, y: wy } = winPosition.getPosition();
+    mainWindow.setAlwaysOnTop(false);
+    mainWindow.setVisibleOnAllWorkspaces(true, { visibleOnFullScreen: true });
+    mainWindow.focus();
+    mainWindow.setVisibleOnAllWorkspaces(false, {
+      visibleOnFullScreen: true,
+    });
+    mainWindow.setPosition(wx, wy);
+    mainWindow.show();
+  }
+
   const init = async () => {
     await setAutoLogin();
     await setDarkMode();
     await setTheme();
     const config = await localConfig.getConfig();
     globalShortcut.unregisterAll();
-    // 注册偏好快捷键
-    globalShortcut.register(config.perf.shortCut.showAndHidden, () => {
-      const currentShow = mainWindow.isVisible() && mainWindow.isFocused();
-      if (currentShow) return mainWindow.hide();
-      const { x: wx, y: wy } = winPosition.getPosition();
-      mainWindow.setAlwaysOnTop(false);
-      mainWindow.setVisibleOnAllWorkspaces(true, { visibleOnFullScreen: true });
-      mainWindow.focus();
-      mainWindow.setVisibleOnAllWorkspaces(false, {
-        visibleOnFullScreen: true,
-      });
-      mainWindow.setPosition(wx, wy);
-      mainWindow.show();
-    });
 
+    // 注册偏好快捷键
+    // 处理显示/隐藏快捷键的注册
+    const doublePressShortcuts = ['Ctrl+Ctrl', 'Option+Option', 'Shift+Shift', 'Command+Command'];
+    const isDoublePressShortcut = doublePressShortcuts.includes(config.perf.shortCut.showAndHidden);
+    
+    if (isDoublePressShortcut) {
+      // 双击快捷键（如 Ctrl+Ctrl）详见 uIOhookRegister 函数实现
+    } else {
+      // 注册普通快捷键（如 Ctrl+Space、F8 等）
+      globalShortcut.register(config.perf.shortCut.showAndHidden, () => {
+        mainWindowPopUp();
+      });
+    }
+
+    // 截图快捷键
     globalShortcut.register(config.perf.shortCut.capture, () => {
       screenCapture(mainWindow, (data) => {
         data &&
@@ -93,6 +110,17 @@ const registerHotKey = (mainWindow: BrowserWindow): void => {
       // mainWindow.show();
     });
 
+    // 添加局部快捷键监听
+    mainWindow.webContents.on('before-input-event', (event, input) => {
+      if (input.key.toLowerCase() === 'w'
+        && (input.control || input.meta) && !input.alt && !input.shift) {
+        event.preventDefault();
+        if (mainWindow && !mainWindow.isDestroyed()) {
+          mainWindow.hide();
+        }
+      }
+    });
+
     // 注册自定义全局快捷键
     config.global.forEach((sc) => {
       if (!sc.key || !sc.value) return;
@@ -101,9 +129,48 @@ const registerHotKey = (mainWindow: BrowserWindow): void => {
       });
     });
   };
+
+  uIOhookRegister(mainWindowPopUp);
   init();
   ipcMain.on('re-register', () => {
     init();
   });
 };
 export default registerHotKey;
+
+function uIOhookRegister(callback: () => void) {
+  let lastModifierPress = Date.now();
+  uIOhook.on('keydown', async (uio_event) => {
+    const config = await localConfig.getConfig(); // 此处还有优化空间
+
+    if (
+      ![
+        'Ctrl+Ctrl',
+        'Option+Option',
+        'Shift+Shift',
+        'Command+Command',
+      ].includes(config.perf.shortCut.showAndHidden)
+    ) {
+      return;
+    }
+
+    // 双击快捷键，如 Ctrl+Ctrl
+    const modifers = config.perf.shortCut.showAndHidden.split('+');
+    const showAndHiddenKeyStr = modifers.pop(); // Ctrl
+    const keyStr2uioKeyCode = {
+      Ctrl: UiohookKey.Ctrl,
+      Shift: UiohookKey.Shift,
+      Option: UiohookKey.Alt,
+      Command: UiohookKey.Comma,
+    };
+
+    if (uio_event.keycode === keyStr2uioKeyCode[showAndHiddenKeyStr]) {
+      const currentTime = Date.now();
+      if (currentTime - lastModifierPress < 300) {
+        callback(); // 调用 mainWindowPopUp
+      }
+      lastModifierPress = currentTime;
+    }
+  });
+  uIOhook.start();
+}

src/renderer/plugins-manager/index.ts

@@ -46,7 +46,7 @@ const createPluginManager = (): any => {
   const initLocalStartPlugin = () => {
     const result = ipcRenderer.sendSync('msg-trigger', {
       type: 'dbGet',
-      data: { id: PLUGIN_HISTORY },
+      data: { id: 'rubick-local-start-app' },
     });
     if (result && result.value) {
       appList.value.push(...result.value);