Merge pull request #411 from PineSongCN/master

🐛 修复 #410

.github/workflows/main.yml

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

README.md

@@ -104,6 +104,13 @@ If the project is helpful to you, you can buy me a cup of coffee as a reward!
 <img width="180" src="https://picx.zhimg.com/80/v2-3160247d6099053405e6cd2cb6afb5e5_720w.png">
 </div>
 
+## 友情链接
+
+<a href="https://pro.kuaitu.cc/" target="_blank">
+<img width="100" src="https://github.com/user-attachments/assets/6127488e-466b-4e71-98ab-00fb3c76553e" />
+</a>
+
+
 ## Feedback
 Those who are interested in this project or want to exchange and learn can scan the QR code and add the following WeChat, with the comment rubick, to help us grow better.
 

feature/src/App.vue

@@ -8,37 +8,37 @@
       >
         <a-menu-item key="finder">
           <template #icon>
-            <StarOutlined style="font-size: 18px;" />
+            <StarOutlined style="font-size: 16px" />
           </template>
           {{ $t('feature.market.explore') }}
         </a-menu-item>
         <a-menu-item key="worker">
           <template #icon>
-            <SendOutlined style="transform: rotate(-45deg); font-size: 18px;" />
+            <SendOutlined style="transform: rotate(-45deg); font-size: 16px" />
           </template>
           {{ $t('feature.market.efficiency') }}
         </a-menu-item>
         <a-menu-item key="tools">
           <template #icon>
-            <SearchOutlined style="font-size: 18px;" />
+            <SearchOutlined style="font-size: 16px" />
           </template>
           {{ $t('feature.market.searchTool') }}
         </a-menu-item>
         <a-menu-item key="image">
           <template #icon>
-            <FileImageOutlined style="font-size: 18px;" />
+            <FileImageOutlined style="font-size: 16px" />
           </template>
           {{ $t('feature.market.imageTool') }}
         </a-menu-item>
         <a-menu-item key="devPlugin">
           <template #icon>
-            <CodeOutlined style="font-size: 18px;" />
+            <CodeOutlined style="font-size: 16px" />
           </template>
           {{ $t('feature.market.developTool') }}
         </a-menu-item>
         <a-menu-item key="system">
           <template #icon>
-            <DatabaseOutlined style="font-size: 18px;" />
+            <DatabaseOutlined style="font-size: 16px" />
           </template>
           {{ $t('feature.market.systemTool') }}
         </a-menu-item>
@@ -72,7 +72,21 @@
         </a-sub-menu>
       </a-menu>
     </div>
-    <div :class="['finder', 'result', 'devPlugin', 'image', 'tools', 'worker', 'system'].includes(active[0]) ? 'container' : 'more'">
+    <div
+      :class="
+        [
+          'finder',
+          'result',
+          'devPlugin',
+          'image',
+          'tools',
+          'worker',
+          'system',
+        ].includes(active[0])
+          ? 'container'
+          : 'more'
+      "
+    >
       <keep-alive>
         <router-view />
       </keep-alive>
@@ -103,14 +117,14 @@ const active = computed(() => store.state.active);
 const { perf } = localConfig.getConfig();
 
 const changeMenu = (key: any) => {
-  store.commit('commonUpdate', {active: [key]})
+  store.commit('commonUpdate', { active: [key] });
   router.push(key);
 };
 
 window.rubick.onPluginEnter(({ code }: { code: string }) => {
   code = code === '已安装插件' ? 'installed' : code;
   changeMenu(code);
-  store.commit('commonUpdate', {active: [code]})
+  store.commit('commonUpdate', { active: [code] });
 });
 
 window.rubick.setSubInput((e: any) => {
@@ -129,7 +143,7 @@ window.rubick.setSubInput((e: any) => {
       store.commit('setSearchValue', e.text);
       router.push('result');
     } else {
-      store.commit('commonUpdate', {active: ['finder']})
+      store.commit('commonUpdate', { active: ['finder'] });
       router.push('finder');
     }
   }
@@ -144,13 +158,16 @@ init();
     background: var(--color-body-bg2) !important;
     height: 100%;
     border-right: none;
-    .ant-menu-item, .ant-menu-submenu, .ant-menu-submenu-arrow {
+    .ant-menu-item,
+    .ant-menu-submenu,
+    .ant-menu-submenu-arrow {
       color: var(--color-text-content);
       &:active {
         background: none;
       }
     }
-    .ant-menu-item-selected, .ant-menu-submenu-selected {
+    .ant-menu-item-selected,
+    .ant-menu-submenu-selected {
       background-color: var(--color-list-hover);
       color: var(--ant-primary-color);
       .ant-menu-submenu-arrow {
@@ -203,9 +220,12 @@ init();
     background: var(--color-body-bg2);
   }
   .left-menu {
-    padding: 24px 16px;
+    padding: 16px;
     position: relative;
     height: 100vh;
+    :deep(.ant-menu) {
+      width: 100%;
+    }
     :deep(.ant-menu-item) {
       padding-left: 12px !important;
       display: flex;
@@ -219,7 +239,14 @@ init();
     }
     :deep(.user-info) {
       position: absolute;
-      bottom: 32px;
+      bottom: 16px;
+      width: calc(100% - 32px);
+      .ant-menu-submenu-title {
+        padding: 0 32px 0 8px;
+        .ant-menu-title-content {
+          margin-left: 8px;
+        }
+      }
     }
     :deep(.ant-avatar) {
       background: transparent;

feature/src/assets/request/index.ts

@@ -1,6 +1,6 @@
 import axios from 'axios';
 
-let baseURL = 'https://gitcode.net/rubickcenter/rubick-database/-/raw/master';
+let baseURL = 'https://gitee.com/monkeyWang/rubickdatabase/raw/master';
 let access_token = '';
 
 try {
@@ -14,7 +14,7 @@ try {
 const instance = axios.create({
   timeout: 4000,
   baseURL:
-    baseURL || 'https://gitcode.net/rubickcenter/rubick-database/-/raw/master',
+    baseURL || 'https://gitee.com/monkeyWang/rubickdatabase/raw/master',
 });
 
 export default {
@@ -23,9 +23,10 @@ export default {
     if (access_token) {
       targetPath = `${encodeURIComponent(
         targetPath
-      )}/raw?access_token=${access_token}&ref=master`;
+      )}?access_token=${access_token}&ref=master`;
     }
     const res = await instance.get(targetPath);
+    console.log('total plugsin', res);
     return res.data;
   },
 
@@ -34,7 +35,7 @@ export default {
     if (access_token) {
       targetPath = `${encodeURIComponent(
         targetPath
-      )}/raw?access_token=${access_token}&ref=master`;
+      )}?access_token=${access_token}&ref=master`;
     }
     const res = await instance.get(targetPath);
     return res.data;
@@ -45,7 +46,7 @@ export default {
     if (access_token) {
       targetPath = `${encodeURIComponent(
         targetPath
-      )}/raw?access_token=${access_token}&ref=master`;
+      )}?access_token=${access_token}&ref=master`;
     }
     const res = await instance.get(targetPath);
     return res.data;
@@ -55,7 +56,7 @@ export default {
     if (access_token) {
       targetPath = `${encodeURIComponent(
         targetPath
-      )}/raw?access_token=${access_token}&ref=master`;
+      )}?access_token=${access_token}&ref=master`;
     }
     const res = await instance.get(targetPath);
     return res.data;
@@ -71,7 +72,7 @@ export default {
     if (access_token) {
       targetPath = `${encodeURIComponent(
         targetPath
-      )}/raw?access_token=${access_token}&ref=master`;
+      )}?access_token=${access_token}&ref=master`;
     }
     const res = await instance.get(targetPath);
     return res.data;
@@ -81,7 +82,7 @@ export default {
     if (access_token) {
       targetPath = `${encodeURIComponent(
         targetPath
-      )}/raw?access_token=${access_token}&ref=master`;
+      )}?access_token=${access_token}&ref=master`;
     }
     const res = await instance.get(targetPath);
     return res.data;
@@ -91,7 +92,7 @@ export default {
     if (access_token) {
       targetPath = `${encodeURIComponent(
         targetPath
-      )}/raw?access_token=${access_token}&ref=master`;
+      )}?access_token=${access_token}&ref=master`;
     }
     const res = await instance.get(targetPath);
     return res.data;

feature/src/views/settings/localhost.vue

@@ -17,7 +17,7 @@
       name="register"
     >
       <a-input
-        placeholder="https://registry.npm.taobao.org"
+        placeholder="https://registry.npmmirror.com"
         v-model:value="formState.register"
       />
     </a-form-item>
@@ -27,7 +27,7 @@
       name="database"
     >
       <a-input
-        placeholder="https://gitcode.net/rubickcenter/rubick-database/-/raw/master"
+        placeholder="https://gitee.com/monkeyWang/rubickdatabase/raw/master"
         v-model:value="formState.database"
       />
     </a-form-item>
@@ -54,8 +54,8 @@ import { message } from 'ant-design-vue';
 let _rev: any;
 
 let defaultConfig = {
-  register: 'https://registry.npm.taobao.org',
+  register: 'https://registry.npmmirror.com',
-  database: 'https://gitcode.net/rubickcenter/rubick-database/-/raw/master',
+  database: 'https://gitee.com/monkeyWang/rubickdatabase/raw/master',
   access_token: '',
 };
 
@@ -81,7 +81,7 @@ const layout = {
 const resetForm = () => {
   formState.value = {
     register: 'https://registry.npmmirror.com',
-    database: 'https://gitcode.net/rubickcenter/rubick-database/-/raw/master',
+    database: 'https://gitee.com/monkeyWang/rubickdatabase/raw/master',
     access_token: '',
   };
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rubick",
-  "version": "4.2.4",
+  "version": "4.3.2",
   "author": "muwoo <2424880409@qq.com>",
   "private": true,
   "scripts": {

src/core/plugin-handler/index.ts

@@ -7,11 +7,10 @@ import path from 'path';
 import got from 'got';
 import fixPath from 'fix-path';
 
+import spawn from 'cross-spawn';
 import { ipcRenderer } from 'electron';
 import axios from 'axios';
 
-import npm from 'npm';
-
 fixPath();
 
 /**
@@ -42,7 +41,7 @@ class AdapterHandler {
     }
     this.baseDir = options.baseDir;
 
-    let register = options.registry || 'https://registry.npmmirror.com/';
+    let register = options.registry || 'https://registry.npmmirror.com';
 
     try {
       const dbdata = ipcRenderer.sendSync('msg-trigger', {
@@ -61,7 +60,7 @@ class AdapterHandler {
     const packageJSON = JSON.parse(
       fs.readFileSync(`${this.baseDir}/package.json`, 'utf-8')
     );
-    const registryUrl = `${this.registry}${name}`;
+    const registryUrl = `https://registry.npmmirror.com/${name}`;
 
     // 从npm源中获取依赖包的最新版本
     try {
@@ -158,32 +157,43 @@ class AdapterHandler {
    */
   private async execCommand(cmd: string, modules: string[]): Promise<string> {
     return new Promise((resolve: any, reject: any) => {
-      const module =
+      let args: string[] = [cmd].concat(
         cmd !== 'uninstall' && cmd !== 'link'
           ? modules.map((m) => `${m}@latest`)
-          : modules;
+          : modules
-      const config: any = {
+      );
-        prefix: this.baseDir,
-        save: true,
-        cache: path.join(this.baseDir, 'cache'),
-      };
       if (cmd !== 'link') {
-        config.registry = this.registry;
+        args = args
-      }
+          .concat('--color=always')
-      npm.load(config, function (err) {
+          .concat('--save')
-        npm.commands[cmd](module, function (er, data) {
+          .concat(`--registry=${this.registry}`);
-          if (!err) {
-            console.log(data);
-            resolve({ code: -1, data });
-          } else {
-            reject({ code: -1, data: err });
       }
+
+      const npm = spawn('npm', args, {
+        cwd: this.baseDir,
       });
 
-        npm.on('log', function (message) {
+      console.log(args);
-          // log installation progress
+
-          console.log(message);
+      let output = '';
-        });
+      npm.stdout
+        .on('data', (data: string) => {
+          output += data; // 获取输出日志
+        })
+        .pipe(process.stdout);
+
+      npm.stderr
+        .on('data', (data: string) => {
+          output += data; // 获取报错日志
+        })
+        .pipe(process.stderr);
+
+      npm.on('close', (code: number) => {
+        if (!code) {
+          resolve({ code: 0, data: output }); // 如果没有报错就输出正常日志
+        } else {
+          reject({ code: code, data: output }); // 如果报错就输出报错日志
+        }
       });
     });
   }

src/main/browsers/main.ts

@@ -25,7 +25,7 @@ export default () => {
       height: WINDOW_HEIGHT,
       minHeight: WINDOW_MIN_HEIGHT,
       useContentSize: true,
-      resizable: false,
+      resizable: true,
       width: WINDOW_WIDTH,
       frame: false,
       title: '拉比克',

src/main/browsers/runner.ts

@@ -175,22 +175,21 @@ export default () => {
 
   const removeView = (window: BrowserWindow) => {
     if (!view) return;
+    executeHooks('PluginOut', null);
+    setTimeout(() => {
       window.removeBrowserView(view);
       if (!view.inDetach) {
         window.setBrowserView(null);
         view.webContents?.destroy();
       }
-
-    // window.setSize(800, 60);
-    executeHooks('PluginOut', null);
       window.webContents?.executeJavaScript(`window.initRubick()`);
       view = undefined;
+    }, 0);
   };
 
   const getView = () => view;
 
   const executeHooks = (hook, data) => {
-    setTimeout(() => {
     if (!view) return;
     const evalJs = `if(window.rubick && window.rubick.hooks && typeof window.rubick.hooks.on${hook} === 'function' ) {
           try {
@@ -199,7 +198,6 @@ export default () => {
         }
       `;
     view.webContents?.executeJavaScript(evalJs);
-    }, 300);
   };
 
   return {

src/main/common/api.ts

@@ -128,8 +128,8 @@ class API extends DBInstance {
   }
 
   public removePlugin(e, window) {
-    this.currentPlugin = null;
     runnerInstance.removeView(window);
+    this.currentPlugin = null;
   }
 
   public openPluginDevTools() {
@@ -211,11 +211,10 @@ class API extends DBInstance {
     if (!Notification.isSupported()) return;
     'string' != typeof body && (body = String(body));
     const plugin = this.currentPlugin;
-    if (!plugin) return;
     const notify = new Notification({
-      title: plugin.pluginName,
+      title: plugin ? plugin.pluginName : null,
       body,
-      icon: plugin.logo,
+      icon: plugin ? plugin.logo : null,
     });
     notify.show();
   }

src/renderer/App.vue

@@ -1,8 +1,5 @@
 <template>
-  <div
+  <div id="components-layout" @mousedown="onMouseDown">
-    id="components-layout"
-    @mousedown="onMouseDown"
-  >
     <Search
       :currentPlugin="currentPlugin"
       @changeCurrent="changeIndex"
@@ -94,7 +91,9 @@ watch(
     window.rubick.setExpendHeight(
       getWindowHeight(
         options.value,
-        (pluginLoading.value || !config.value.perf.common.history) ? [] : pluginHistory.value
+        pluginLoading.value || !config.value.perf.common.history
+          ? []
+          : pluginHistory.value
       )
     );
   },
@@ -104,26 +103,15 @@ watch(
 );
 
 const changeIndex = (index) => {
-  if (!options.value.length) {
+  const len = options.value.length || pluginHistory.value.length;
-    if (!pluginHistory.value.length) return;
+  if (!len) return;
-    if (
+  if (currentSelect.value + index > len - 1) {
-      currentSelect.value + index > pluginHistory.value.length - 1 ||
-      currentSelect.value + index < 0
-    ) {
     currentSelect.value = 0;
-      return;
+  } else if (currentSelect.value + index < 0) {
-    }
+    currentSelect.value = len - 1;
+  } else {
     currentSelect.value = currentSelect.value + index;
-    return;
   }
-  if (
-    currentSelect.value + index > options.value.length - 1 ||
-    currentSelect.value + index < 0
-  ) {
-    currentSelect.value = 0;
-    return;
-  }
-  currentSelect.value = currentSelect.value + index;
 };
 
 const openMenu = (ext) => {
@@ -161,7 +149,9 @@ const choosePlugin = (plugin) => {
     });
     if (hasRemove) {
       const result = window.rubick.db.get(PLUGIN_HISTORY) || {};
-      const history = result.data.filter(item => item.originName !== currentChoose.originName);
+      const history = result.data.filter(
+        (item) => item.originName !== currentChoose.originName
+      );
       setPluginHistory(history);
       return message.warning('插件已被卸载！');
     }

src/renderer/components/result.vue

@@ -1,8 +1,13 @@
 <template>
-  <div v-show="!currentPlugin.name && config.perf.common.history" class="options">
+  <div v-show="!currentPlugin.name" class="options">
     <div
       class="history-plugins"
-      v-if="!options.length || !(searchValue || !!clipboardFile.length)"
+      v-if="
+        !options.length &&
+        !searchValue &&
+        !clipboardFile.length &&
+        config.perf.common.history
+      "
     >
       <a-row>
         <a-col

src/renderer/components/search.vue

@@ -25,6 +25,8 @@
       ref="mainInput"
       class="main-input"
       @input="(e) => changeValue(e)"
+      @keydown.left="(e) => keydownEvent(e, 'left')"
+      @keydown.right="(e) => keydownEvent(e, 'right')"
       @keydown.down="(e) => keydownEvent(e, 'down')"
       @keydown.tab="(e) => keydownEvent(e, 'down')"
       @keydown.up="(e) => keydownEvent(e, 'up')"
@@ -41,10 +43,7 @@
     >
       <template #suffix>
         <div class="suffix-tool">
-          <MoreOutlined
+          <MoreOutlined @click="showSeparate()" class="icon-more" />
-            @click="showSeparate()"
-            class="icon-more"
-          />
         </div>
       </template>
     </a-input>
@@ -120,6 +119,12 @@ const keydownEvent = (e, key: string) => {
     case 'down':
       emit('changeCurrent', 1);
       break;
+    case 'left':
+      emit('changeCurrent', -1);
+      break;
+    case 'right':
+      emit('changeCurrent', 1);
+      break;
     case 'enter':
       if (runPluginDisable) return;
       emit('choosePlugin');