rewrite test

Author: icymind

config/ss-over-kt.json

@@ -1,11 +1,11 @@
 {
-    "server":       "127.0.0.1",
-    "server_port":  1070,
-    "local_address": "0.0.0.0",
-    "local_port":   1090,
-    "password":     "demo",
-    "timeout":      20,
-    "method":       "chacha20",
-    "fast_open":    false,
-    "mode":         "tcp_only"
+    "server":"127.0.0.1",
+    "server_port":1070,
+    "local_address":"0.0.0.0",
+    "local_port":1090,
+    "password":"demo",
+    "timeout":20,
+    "method":"chacha20",
+    "fast_open":false,
+    "mode":"tcp_only"
 }

js/vrouter-local.js

@@ -14,6 +14,7 @@ const crypto = require('crypto')
 const sudo = require('sudo-prompt')
 const { EventEmitter } = require('events')
 const os = require('os')
+const winston = require('winston')
 
 let VBoxManage
 
@@ -24,22 +25,37 @@ if (os.platform() === 'darwin') {
 }
 
 class VRouter {
-  constructor () {
+  constructor (cfgObj) {
     let config
     let cfg = path.join(getAppDir(), packageJson.name, 'config.json')
-    try {
-      config = fs.readJsonSync(cfg)
-    } catch (err) {
-      const template = path.join(__dirname, '..', 'config', 'config.json')
-      config = fs.readJsonSync(template)
-      fs.copySync(template, cfg)
-    }
-    if (!config.host.configDir) {
-      config.host.configDir = path.join(getAppDir(), packageJson.name)
+    if (!cfgObj) {
+      try {
+        config = fs.readJsonSync(cfg)
+      } catch (err) {
+        const template = path.join(__dirname, '..', 'config', 'config.json')
+        config = fs.readJsonSync(template)
+        fs.copySync(template, cfg)
+      }
+      if (!config.host.configDir) {
+        config.host.configDir = path.join(getAppDir(), packageJson.name)
+      }
+    } else {
+      config = cfgObj
     }
     this.config = config
     this.process = new EventEmitter()
     this.remote = null
+    winston.configure({
+      transports: [
+        new (winston.transports.File)({
+          filename: path.join(this.config.host.configDir, 'vrouter.log'),
+          level: 'info'
+        }),
+        new (winston.transports.Console)({
+          level: 'debug'
+        })
+      ]
+    })
   }
 
   // os
@@ -111,7 +127,7 @@ class VRouter {
         return match[1]
       }
     }
-    return Error(`can not find NetworkService match ${inf}`)
+    throw Error(`can not find NetworkService match ${inf}`)
   }
   async getCurrentGateway () {
     let networkService
@@ -162,7 +178,7 @@ class VRouter {
       if (match && match[1]) {
         ip = match[1]
       } else {
-        return Error('can not get Router IP')
+        throw Error('can not get Router IP')
       }
     }
     const cmd1 = `/sbin/route change default ${ip}`
@@ -604,15 +620,15 @@ class VRouter {
       infos.set(temp[0].replace(/"/g, ''), temp[1].replace(/"/g, ''))
     })
     if (infos.get('nic1') !== 'hostonly') {
-      return Error("NIC1 isn't hostonly network")
+      throw Error("NIC1 isn't hostonly network")
     }
     if (!/^vboxnet\d+$/ig.test(infos.get('hostonlyadapter1'))) {
-      return Error("NIC1 doesn't specify host-only adapter")
+      throw Error("NIC1 doesn't specify host-only adapter")
     }
     const inf = infos.get('hostonlyadapter1')
     const ip = await this.getInfIP(inf)
     if (ip !== this.config.host.ip) {
-      return Error("host-only adapter doesn't config as hostIP")
+      throw Error("host-only adapter doesn't config as hostIP")
     }
     return inf
   }
@@ -625,16 +641,16 @@ class VRouter {
       infos.set(temp[0].replace(/"/g, ''), temp[1].replace(/"/g, ''))
     })
     if (infos.get('nic2') !== 'bridged') {
-      return Error("NIC2 isn't bridged network")
+      throw Error("NIC2 isn't bridged network")
     }
     const inf = infos.get('bridgeadapter2')
     if (!inf) {
-      return Error("NIC2 doesn't specify bridged adapter")
+      throw Error("NIC2 doesn't specify bridged adapter")
     }
     cmd = `/sbin/ifconfig ${inf.trim().split(':')[0]}`
     const infConfig = await this.localExec(cmd)
     const statusMatch = /status: active/ig.exec(infConfig)
-    if (!statusMatch) return Error("bridged adapter doesn't active")
+    if (!statusMatch) throw Error("bridged adapter doesn't active")
     return inf
   }
 
@@ -653,10 +669,12 @@ class VRouter {
     }
     await this.isNIC1ConfigedAsHostonly(this.config.vrouter.name, this.config.host.ip)
       .catch(() => {
+        winston.debug(`isNIC1ConfigedAsHostonly return false. vrouter: ${this.config.vrouter.name}, hostip: ${this.config.host.ip}`)
         return this.specifyHostonlyAdapter()
       })
     await this.isNIC2ConfigedAsBridged(this.config.vrouter.name)
       .catch(() => {
+        winston.debug(`isNIC2ConfigedAsBridged return false. vrouter: ${this.config.vrouter.name}, hostip: ${this.config.host.ip}`)
         return this.specifyBridgeAdapter()
       })
   }
@@ -721,7 +739,7 @@ class VRouter {
   }
   async changevmTZ () {
     const cc = String.raw`
-        uci set system.@system[0].hostname='VRouter'
+        uci set system.@system[0].hostname='${this.config.vrouter.name}'
         uci set system.@system[0].timezone='HKT-8'
         uci set system.@system[0].zonename='Asia/Hong Kong'
         uci commit system`
@@ -760,9 +778,11 @@ class VRouter {
   async getCfgContent (fileName) {
     const filePath = path.join(this.config.host.configDir, fileName)
     try {
-      return fs.readFile(filePath, 'utf8')
+      const content = await fs.readFile(filePath, 'utf8')
+      return content
     } catch (error) {
       const template = path.join(__dirname, '../config', fileName)
+      winston.debug(`can not find ${filePath}, copy template ${template} to appdir`)
       await fs.copy(template, filePath)
       return fs.readFile(filePath, 'utf8')
     }
@@ -772,7 +792,7 @@ class VRouter {
     const stats = await fs.stat(cfgPath)
       .catch(() => null)
     if (stats && stats.isFile() && !overwrite) {
-      return Promise.resolve(cfgPath)
+      return cfgPath
     }
     const ws = fs.createWriteStream(cfgPath)
     const promise = new Promise((resolve, reject) => {
@@ -792,6 +812,7 @@ class VRouter {
     // "selectedBL": {"gfwDomains":true, "extraBlackList":true},
     // "selectedWL": {"chinaIPs":true, "lanNetworks":true, "extraWhiteList":true},
     if (this.config.firewall.selectedWL.lanNetworks) {
+      winston.debug(`getCfgContent: ${this.config.firewall.lanNetworks}`)
       const lan = await this.getCfgContent(this.config.firewall.lanNetworks)
       lan.split('\n').forEach((line) => {
         const trimLine = line.trim()
@@ -1508,7 +1529,7 @@ class VRouter {
       await fs.stat(dest)
       return dest
     } catch (error) {
-      console.log(`${dest} not exist, copy template to it.`)
+      winston.debug(`copy template: ${fileName}`)
       await fs.copy(template, dest)
       return dest
     }
@@ -1533,6 +1554,7 @@ class VRouter {
         break
       case 'ktService':
         p = await this.generateService('kcptun')
+        winston.debug(`generateService-kcptun for proxies: ${this.config.firewall.currentProxies}`)
         await this.scp(p, '/etc/init.d/')
         await this.serialExec(`chmod +x /etc/init.d/${this.config.kcptun.service}`)
         break
@@ -1551,6 +1573,7 @@ class VRouter {
         break
       case 'ipset':
         p = await this.generateIPsets(overwrite)
+        winston.debug('generated ipset')
         await this.scp(p, this.config.vrouter.configDir)
         break
       case 'firewall':
@@ -1599,7 +1622,7 @@ class VRouter {
   async connect (startFirst) {
     const state = await this.getvmState()
     if (state !== 'running') {
-      return Error("vm doesn't running.")
+      throw Error("vm doesn't running.")
     }
     return new Promise((resolve, reject) => {
       const conn = new Client()

js/vrouter-remote.js

@@ -138,15 +138,6 @@ class VRouterRemote {
       return false
     }
   }
-  getSsOverKtProcess () {
-    const cmd = 'ps -w| grep "[s]s-redir -c .*ss-over-kt.json"'
-    return this.remoteExec(cmd)
-  }
-  getSsProcess () {
-    // const cmd = 'ps | grep "[s]s-redir -c .*ss-client.json"'
-    const cmd = 'ps -w| grep "[s]s-redir -c .*ss-client.json"'
-    return this.remoteExec(cmd)
-  }
   // kcptun
   installKt () {
     // const cmd = `tar -xvzf ${this.config.vrouter.configDir}/third_party/kcptun*.tar.gz ` +

test/config/ad-domains.txt

@@ -0,0 +1,99 @@
+#googleads.g.doubleclick.net
+#adclick.g.doubleclick.net
+#union.baidu.com
+#cb.baidu.com
+#a.baidu.com
+#baidutv.baidu.com
+#bar.baidu.com
+#c.baidu.com
+#cjhq.baidu.com
+#cpro.baidu.com
+#drmcmm.baidu.com
+#e.baidu.com
+#eiv.baidu.com
+#hc.baidu.com
+#hm.baidu.com
+#ma.baidu.com
+#nsclick.baidu.com
+#spcode.baidu.com
+#tk.baidu.com
+#union.baidu.com
+#ucstat.baidu.com
+#utility.baidu.com
+#utk.baidu.com
+#focusbaiduafp.allyes.com
+#afp.qiyi.com
+#focusbaiduafp.allyes.com
+#a.cctv.com
+#a.cntv.cn
+#ad.cctv.com
+#d.cntv.cn
+#adguanggao.eee114.com
+#cctv.adsunion.com
+#dcads.sina.com.cn
+#pp2.pptv.com
+#pro.letv.com
+#asimgs.pplive.cn
+#static.uuzu.com
+#v.behe.com
+#images.sohu.com
+#mcfg.sandai.net
+#biz5.sandai.net
+#server1.adpolestar.net
+#advstat.xunlei.com
+#mpv.sandai.net
+#mini.group.qq.com
+#18.dc.ftn.qq.com
+#group.store.qq.com
+#f.qstatic.com
+#wpkg.org
+#www.811115.com
+#www.ms-itsupport.com
+#ms-itsupport.com
+#lottosend.org
+#www.adnetworkperformance.com
+#www.russiawomendate.com
+#29bca6cb72a665c8.se
+#jsj565.gssd.pw
+#dxe.ashf.pw
+#ghjghjty.zz568-link4.top
+#www.quxiu358.com
+#rmek.binteresting.com
+#www.mohipaper.cn
+#tupian.bxg68.com
+#codo.cd828.com
+#www.3vcmdt.com
+#big.djkofew838.top
+#www.7quanba.com
+#www.66008008.com
+#hot.beiqisi.com
+#cs2.youyo.xyz
+#www.fsafa666.com
+#620.yoholne.xyz
+#qqq6.jzgbcw.com
+#www.jcw89.top
+#p.ns5n.com
+#big.ren883hd.pw
+#mm.seochuanmei.com
+#www.u17.com
+#tupian.bxg68.com
+#cfns.pelatoca.com
+#se.hzbzx.com
+#www.yaoguo.com
+#www.sdff2223.com
+#neky.504pk.com
+#g.29m4.com
+#www.xiniuda.space
+#youxi.baidu.com
+#p061015.y1510.com.ru
+#zxhs.f6ce.com
+#rwq.youle55.com
+#www.r76.de
+#img.zhuanfakong.com
+#vipse.win
+#googleadservices.com
+#click.aliyun.com
+#bes.baidu.com
+#simba.taobao.com
+#dj.1688.com
+#click.tanx.com