log more infomation to file

Author: icymind

js/manage.js

@@ -228,6 +228,7 @@ const myApp = new Vue({
         this.profiles.activedProfile -= 1
       }
       await vrouter.saveCfg2File()
+      winston.info(`delete profile: ${index}`)
       $('#profiles .ui.message.dimmed').dimmer('hide')
     },
     editProfile (index) {
@@ -243,6 +244,7 @@ const myApp = new Vue({
       $('#profiles .ui.message.dimmed').dimmer('hide')
       this.ui.activeLoader = true
       this.profiles.activedProfile = index
+      winston.info(`active profile: ${index}`)
       await vrouter.saveCfg2File()
       await this.remote.applyProfile(index)
       await this.refreshInfos()
@@ -257,6 +259,7 @@ const myApp = new Vue({
     },
     importProfile () {
       const uri = document.querySelector('#importProfileModal input').value
+      winston.info(`import profile: ${uri}`)
       try {
         this.editingProfile = vrouter.parseProfileURI(uri)
         this.toggleProfileEditor('show')
@@ -303,6 +306,7 @@ const myApp = new Vue({
       } else {
         this.profiles.profiles[id] = JSON.parse(JSON.stringify(this.editingProfile))
       }
+      winston.info(`save profile: ${this.editingProfile}`)
       await vrouter.saveCfg2File()
       this.toggleProfileEditor('hide')
 
@@ -338,6 +342,7 @@ const myApp = new Vue({
         this.status.currentGW = 'default'
         this.status.currentDns = 'default'
       }
+      winston.info(`checkTrafficStatus: currentGW=${this.status.currentGW}, currentDns=${this.status.currentDns}`)
       const isGWVRouter = this.status.currentGW === 'vrouter'
       this.ui.btnToggleRouterPopup = isGWVRouter ? '停止接管流量' : '开始接管流量'
       // this.toggleBlink(isGWVRouter)
@@ -631,19 +636,6 @@ document.addEventListener('DOMContentLoaded', async () => {
   $('.tabular.menu .item').tab()
   $('.dropdown').dropdown()
   $('*[data-content]').popup()
-  // $('#profileModal').modal({
-    // dimmerSettings: {
-      // opacity: 0.2
-    // },
-    // detachable: false,
-    // closable: false
-  // })
-  // $('#importProfileModal').modal({
-    // dimmerSettings: {
-      // opacity: 0.2
-    // },
-    // detachable: false
-  // })
   $('#profiles .ui.message').dimmer({
     opacity: 0,
     on: 'hover',

js/vrouter-local.js

@@ -69,30 +69,19 @@ class VRouter {
     return new Promise((resolve, reject) => {
       sudo.exec(cmd, option, (err, stdout, stderr) => {
         if (err) {
-          // console.log(err)
           reject(err)
         } else {
-          // stderr && console.log(stderr)
           resolve(stdout || stderr)
         }
       })
     })
   }
   localExec (cmd) {
-    // const specialCmd = [
-      // /^VBoxManage hostonlyif .*$/ig,
-      // /^VBoxManage startvm/ig,
-      // /^VBoxManage controlvm .* poweroff/ig,
-      // /^VBoxManage convertfromraw .ig
-     // ]
-
     return new Promise((resolve, reject) => {
       exec(cmd, (err, stdout, stderr) => {
         if (err) {
-          // console.log(err)
           reject(err)
         } else {
-          // stderr && console.log(stderr)
           resolve(stdout || stderr)
         }
       })
@@ -116,6 +105,7 @@ class VRouter {
     return this.localExec(cmd)
   }
   async getOSXNetworkService (inf) {
+    // 返回 en{0-9} 对应的网络服务
     const cmd = `/usr/sbin/networksetup -listnetworkserviceorder`
     const output = await this.localExec(cmd)
     const reg = /\(\d+\) (.*)\n\(Hardware Port: .*?, Device: (.*)\)/g
@@ -446,37 +436,42 @@ EOF`
   }
   async startvm (type = 'headless', waitTime = 100) {
     const state = await this.getvmState()
-    if (state !== 'running') {
-      const cmd = `${VBoxManage} startvm --type ${type} ${this.config.vrouter.name}`
-      await this.localExec(cmd)
-      await this.wait(1000)
-      await this.sendKeystrokes()
-      // skip grub's waiting time
-      await this.wait(500)
-      await this.sendKeystrokes()
-      await this.wait(waitTime)
+    if (state === 'running') {
+      return
     }
+    const cmd = `${VBoxManage} startvm --type ${type} ${this.config.vrouter.name}`
+    await this.localExec(cmd)
+    await this.wait(1000)
+    await this.sendKeystrokes()
+    // skip grub's waiting time
+    await this.wait(500)
+    await this.sendKeystrokes()
+    await this.wait(waitTime)
   }
   async stopvm (action = 'savestate', waitTime = 100) {
     const serialPortState = await this.isSerialPortOn()
     const vmState = await this.getvmState()
     if (vmState === 'running') {
       winston.debug(`about to stop vm. current State: ${vmState}. action: ${action}`)
       if (action === 'force') {
+        winston.debug('vrouter poweroff by controlvm')
         const cmd = `${VBoxManage} controlvm ${this.config.vrouter.name} poweroff`
         await this.localExec(cmd)
         return this.wait(waitTime)
       } else if (action === 'poweroff') {
         if (serialPortState) {
           // poweroff from inside openwrt is more safer.
+          winston.debug('poweroff by serialExec')
           await this.serialExec('poweroff', 'poweroff')
           return this.wait(8000)
         } else {
+          winston.debug('vrouter poweroff by controlvm')
           const cmd = `${VBoxManage} controlvm ${this.config.vrouter.name} poweroff`
           await this.localExec(cmd)
           return this.wait(waitTime)
         }
       } else if (action === 'savestate') {
+        winston.debug('vrouter savestate')
         const cmd = `${VBoxManage} controlvm ${this.config.vrouter.name} savestate`
         await this.localExec(cmd)
         return this.wait(waitTime)
@@ -524,9 +519,6 @@ EOF`
     return state
   }
   async isVRouterRunning () {
-    // State:           running (since 2017-06-16T02:13:09.066000000)
-    // VBoxManage showvminfo com.icymind.test --machinereadable  | grep vmState
-    // vmState="running"
     const cmd = `${VBoxManage} list runningvms`
     const stdout = await this.localExec(cmd)
     const vms = stdout
@@ -551,7 +543,6 @@ EOF`
     return this.localExec(cmd)
   }
   async getHostonlyInf () {
-    // return [correspondingInf, firstAvailableInf]
     const infs = await this.getAllInf()
     const reg = /^vboxnet\d+.*\n(?:\t.*\n)*/img
     let correspondingInf = null

js/vrouter-remote.js

@@ -1,3 +1,4 @@
+const winston = require('winston')
 const path = require('path')
 class VRouterRemote {
   // todo: reconnect
@@ -7,6 +8,17 @@ class VRouterRemote {
     this.config = config
     this.local = local
     this.sftp = sftp
+    winston.configure({
+      transports: [
+        new (winston.transports.File)({
+          filename: path.join(this.config.host.configDir, 'vrouter.log'),
+          level: 'info'
+        }),
+        new (winston.transports.Console)({
+          level: 'debug'
+        })
+      ]
+    })
   }
 
   // vm
@@ -40,6 +52,7 @@ class VRouterRemote {
     })
   }
   async scp (src, dest) {
+    winston.info(`scp ${src} to vrouter:${dest}`)
     let isDestDir = false
     if (dest.endsWith('/')) {
       isDestDir = true
@@ -180,6 +193,7 @@ class VRouterRemote {
     })
   }
   service (name, action) {
+    winston.info(`${action} service: ${name}`)
     const cmd = `/etc/init.d/${name} ${action}`
     return this.remoteExec(cmd)
   }