Merge 2307faf31a into 9813573679

fix #395: the plugin windows error with data retrieve

README.zh-CN.md

@@ -90,6 +90,9 @@
 
 [Rubick Plugin CLI](https://github.com/rubickCenter/rubick-plugin-cli)
 
+## 局限性
+npm包最终大小不宜超过100MB,所以插件包大小也不宜超过此大小,建议20MB以内,如果包体积过大,预期会导致推送npm仓库失败
+
 ## 赞助
 ### 1. 加入知识星球
 我们在知识星球积累了大量的关于 rubick 的知识和常见问题，您可以付费加入我们的知识星球来一起讨论。我们将随时解答！

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;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rubick",
-  "version": "4.2.5",
+  "version": "4.3.1",
   "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.npm.taobao.org';
 
     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.npm.taobao.org/${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;
-      const config: any = {
-        prefix: this.baseDir,
-        save: true,
-        cache: path.join(this.baseDir, 'cache'),
-      };
+          : modules
+      );
       if (cmd !== 'link') {
-        config.registry = this.registry;
+        args = args
+          .concat('--color=always')
+          .concat('--save')
+          .concat(`--registry=${this.registry}`);
       }
-      npm.load(config, function (err) {
-        npm.commands[cmd](module, function (er, data) {
-          if (!err) {
-            console.log(data);
-            resolve({ code: -1, data });
-          } else {
-            reject({ code: -1, data: err });
-          }
-        });
 
-        npm.on('log', function (message) {
-          // log installation progress
-          console.log(message);
-        });
+      const npm = spawn('npm', args, {
+        cwd: this.baseDir,
+      });
+
+      console.log(args);
+
+      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/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