add function: upgradeCfgV2

Author: icymind

config/config.json

@@ -40,24 +40,7 @@
                 }
             },
             {
-                "name": "vps 黑名单",
-                "mode": "blacklist",
-                "proxies": "ss",
-                "relayUDP": false,
-                "enableTunnelDns": true,
-                "selectedBL": {"gfwDomains":true, "extraBlackList":true},
-                "selectedWL": {"chinaIPs":true, "lanNetworks":true, "extraWhiteList":true},
-                "shadowsocks": {
-                    "address": "123.123.123.123",
-                    "port": "8989",
-                    "password": "demo-paswd",
-                    "timeout": 300,
-                    "method": "chacha20",
-                    "fastopen": false
-                }
-            },
-            {
-                "name": "kcp 加速",
+                "name": "kcp 加速ss",
                 "mode": "whitelist",
                 "proxies": "ssKt",
                 "relayUDP": false,
@@ -102,28 +85,6 @@
                     "others": "",
                     "fastopen": false
                 }
-            },
-            {
-                "name": "ssr 白名单",
-                "mode": "whitelist",
-                "proxies": "ssr",
-                "relayUDP": false,
-                "enableTunnelDns": true,
-                "selectedBL": {"gfwDomains":true, "extraBlackList":true},
-                "selectedWL": {"chinaIPs":true, "lanNetworks":true, "extraWhiteList":true},
-                "shadowsocksr": {
-                    "address": "123.123.123.123",
-                    "port": "9999",
-                    "password": "demo-paswd",
-                    "timeout": 300,
-                    "method": "chacha20",
-                    "protocol": "auth_aes128_md5",
-                    "protocol_param": "32",
-                    "obfs": "tls1.2_ticket_auth",
-                    "obfs_param": "",
-                    "others": "",
-                    "fastopen": false
-                }
             }
 
         ],

js/prepare.js

@@ -2,7 +2,7 @@
 /* global Vue */
 const { app, getCurrentWindow } = require('electron').remote
 const path = require('path')
-// const fs = require('fs-extra')
+const fs = require('fs-extra')
 const url = require('url')
 const { VRouter } = require('../js/vrouter-local.js')
 // const { getAppDir } = require('../js/helper.js')
@@ -145,8 +145,9 @@ const vue = new Vue({
 
 async function checkRequirement (vrouter) {
   let ret = await vrouter.isVBInstalled()
-  winston.debug('virtualbox installed')
-  if (!ret) {
+  if (ret) {
+    winston.debug('virtualbox installed')
+  } else {
     winston.warn('no virtualbox installed')
     vue.data = {
       header: '检测 VirtualBox',
@@ -171,6 +172,7 @@ async function checkRequirement (vrouter) {
     vue.show()
     return false
   }
+
   ret = await vrouter.isVRouterExisted()
   if (!ret) {
   // if (true) {
@@ -229,7 +231,11 @@ async function checkRequirement (vrouter) {
     // closable: false
   // }
   // vue.show()
-  await vrouter.upgradeCfg()
+  const template = path.join(__dirname, '..', 'config', 'config.json')
+  const newCfg = fs.readJsonSync(template)
+  await vrouter.upgradeCfgV1(newCfg)
+  await vrouter.upgradeCfgV2(newCfg)
+  await vrouter.saveCfg2File()
   redirect()
 }
 

js/vrouter-local.js

@@ -1620,12 +1620,14 @@ echo ""`
 
   saveCfg2File () {
     const cfgPath = path.join(this.config.host.configDir, 'config.json')
-    return fs.writeJson(cfgPath, this.config, {spaces: 2})
-  }
-  async upgradeCfg () {
-    const template = path.join(__dirname, '..', 'config', 'config.json')
-    const newCfg = fs.readJsonSync(template)
-    // const oldCfg = fs.readJsonSync(path.join(this.config.host.configDir, 'config.json'))
+    console.log(this.config.host.configDir)
+    console.log(cfgPath)
+    console.log(this.config)
+    // return fs.writeJson(cfgPath, this.config, {spaces: 2})
+  }
+  async upgradeCfgV1 (newCfg) {
+    // const template = path.join(__dirname, '..', 'config', 'config.json')
+    // const newCfg = fs.readJsonSync(template)
     if (this.config.version === newCfg.version) {
       return
     }
@@ -1665,12 +1667,65 @@ echo ""`
       await remote.service('shadowsocks', 'stop').catch(() => {})
       await remote.service('kcptun', 'stop').catch(() => {})
       await remote.remoteExec('rm /etc/com.icymind.vrouter/ss-dns.json').catch(() => {})
-      await remote.changeProxies()
+      // await remote.changeProxies()
       await remote.closeConn()
-    } else if (this.config.version === '0.2') {
-
     }
-    return this.saveCfg2File()
+  }
+  async upgradeCfgV2 (newCfg) {
+    // const template = path.join(__dirname, '..', 'config', 'config.json')
+    // const newCfg = fs.readJsonSync(template)
+    if (this.config.version === '0.2') {
+      const profiles = []
+      // 如果ss地址不是123123...拷贝到newCfg
+      // 同理ssr/kcptun
+      const oldSS = this.config.shadowsocks.server
+      const oldSSR = this.config.shadowsocksr.server
+      const oldKT = this.config.kcptun.server
+      if (oldSS.address && oldSS.address !== '123.123.123.123') {
+        const profile = {
+          'name': '配置oo',
+          'mode': 'whitelist',
+          'proxies': 'ss',
+          'relayUDP': false,
+          'enableTunnelDns': true,
+          'selectedBL': {'gfwDomains': true, 'extraBlackList': true},
+          'selectedWL': {'chinaIPs': true, 'lanNetworks': true, 'extraWhiteList': true},
+          'shadowsocks': oldSS
+        }
+        profiles.push(profile)
+      }
+      if (oldSSR.address && oldSSR.address !== '123.123.123.123') {
+        const profile = {
+          'name': '配置xx',
+          'mode': 'blacklist',
+          'proxies': 'ssr',
+          'relayUDP': false,
+          'enableTunnelDns': true,
+          'selectedBL': {'gfwDomains': true, 'extraBlackList': true},
+          'selectedWL': {'chinaIPs': true, 'lanNetworks': true, 'extraWhiteList': true},
+          'shadowsocksr': oldSSR
+        }
+        profiles.push(profile)
+      }
+      if (oldKT.address && oldKT.address !== '123.123.123.123') {
+        const profile = {
+          'name': '配置tt',
+          'mode': 'whitelist',
+          'proxies': 'ssKt',
+          'relayUDP': false,
+          'enableTunnelDns': true,
+          'selectedBL': {'gfwDomains': true, 'extraBlackList': true},
+          'selectedWL': {'chinaIPs': true, 'lanNetworks': true, 'extraWhiteList': true},
+          'shadowsocks': oldSS,
+          'kcptun': oldKT
+        }
+        profiles.push(profile)
+      }
+      if (profiles.length !== 0) {
+        newCfg.profiles.profiles = profiles
+      }
+      this.config = newCfg
+    }
   }
   async copyTemplate (fileName) {
     const template = path.join(__dirname, '..', 'config', fileName)