add obfs-local support

Author: icymind

src/main/index.js

@@ -104,7 +104,7 @@ function setMenu () {
           click: async () => {
             logger.info('about to quit VRouter')
             await VRouter.toggleRouting(true, 'off')
-            const cfg = await VRouter.getLatestCfg()
+            const {cfg} = await VRouter.getLatestCfg()
             await VBox.saveState(cfg.virtualbox.vmName)
             app.quit()
           }
@@ -247,7 +247,7 @@ app.on('ready', () => {
         try {
           logger.info('about to quit VRouter')
           await VRouter.toggleRouting(true, 'off')
-          const cfg = await VRouter.getLatestCfg()
+          const {cfg} = await VRouter.getLatestCfg()
           await VBox.saveState(cfg.virtualbox.vmName)
           app.quit()
         } catch (err) {

src/renderer/components/Manage.vue

@@ -110,7 +110,7 @@ const templateProfile = {
     'method': 'chacha20',
     'fast_open': false,
     'plugin': 'obfs-local',
-    'obfs_opts': ''
+    'plugin_opts': 'obfs=http;obfs-host=www.bing.com'
   },
   'shadowsocksr': {
     'server': '123.123.123.123',
@@ -380,7 +380,12 @@ export default {
     }
   },
   created: async function () {
-    this.vrouter = new VRouter(await VRouter.getLatestCfg())
+    const {cfg, needUpdate} = await VRouter.getLatestCfg()
+    this.vrouter = new VRouter(cfg)
+    if (needUpdate) {
+      await this.vrouter.saveCfg2File()
+      await this.vrouter.installApkAfterUpdate(cfg.version)
+    }
     this.profiles = this.vrouter.config.profiles
 
     this.bus = new Vue()

src/renderer/components/Manage/ProfileEditor/ProxiesForm/SsForm.vue

@@ -40,12 +40,14 @@
       </div>
     </div>
 
-    <div class="inline field">
-      <div class="ui checkbox">
+    <div class="field">
+      <div class="ui checkbox field">
         <input type="checkbox" value="obfs" v-model="enableObfs">
         <label>Obfuscating</label>
       </div>
-      <input type="text" v-model="shadowsocks.obfs_opts">
+      <div class="ui fluid input">
+        <input type="text" v-model="shadowsocks.plugin_opts" v-bind:disabled="!enableObfs">
+      </div>
     </div>
   </form>
 </template>
@@ -72,7 +74,7 @@ export default {
         return this.shadowsocks.plugin === 'obfs-local'
       },
       set: function (value) {
-        this.shadowsocks.plugin = value ? 'obfs-local' : 'none'
+        this.shadowsocks.plugin = value ? 'obfs-local' : ''
       }
     }
   }

src/renderer/lib/generator.js

@@ -69,7 +69,9 @@ async function getSsCfgFrom (profile, proxiesInfo) {
     'timeout': parseInt(data.timeout),
     'method': data.method.toLowerCase(),
     'fast_open': data.fast_open,
-    'mode': 'tcp_only'
+    'mode': 'tcp_only',
+    'plugin': data.plugin,
+    'plugin_opts': data.plugin_opts
   }
   if (profile.proxies === 'ssKt') {
     cfg.server = '127.0.0.1'

src/renderer/lib/vrouter.js

@@ -313,21 +313,53 @@ class VRouter extends Openwrt {
     } catch (error) {
       // appdircfg 不存在
       await fs.copy(templateCfgPath, appDirCfgPath)
-      return templateCfg
+      return {
+        cfg: templateCfg,
+        needUpdate: false
+      }
     }
 
-    if (appDirCfg.version < 0.4) {
+    if (parseFloat(appDirCfg.version) < 0.4) {
       // 对 0.4 以下版本不作兼容
       await fs.copy(templateCfgPath, appDirCfgPath)
-      return templateCfg
+      return {
+        cfg: templateCfg,
+        needUpdate: true
+      }
+    }
+
+    if (parseFloat(appDirCfg.version) === 0.4 && parseFloat(templateCfg.version) === 0.5) {
+      logger.info('update config.json to version 0.5')
+      appDirCfg.profiles.forEach(profile => {
+        if (profile.shadowsocks) {
+          profile.shadowsocks.plugin = profile.shadowsocks.plugin || ''
+          profile.shadowsocks.plugin_opts = profile.shadowsocks.plugin_opts || 'obfs=http;obfs-host:www.bing.com'
+        }
+      })
+
+      appDirCfg.version = '0.5'
+      return {
+        cfg: appDirCfg,
+        needUpdate: true
+      }
     }
 
     // appDirCfg 已经是最新版本的配置文件
-    return appDirCfg
+    return {
+      cfg: appDirCfg,
+      needUpdate: false
+    }
+  }
+  async installApkAfterUpdate (version) {
+    if (version === 0.5) {
+      // install obfs-local.apk
+      const targzFPath = path.join(__static, 'bin/shadowsocks.tar.gz')
+      await this.installSs(targzFPath)
+    }
   }
   static async toggleRouting (action = false, type = 'off') {
     logger.info('action', type)
-    const config = await VRouter.getLatestCfg()
+    const config = await VRouter.getLatestCfg().cfg
     const ip = config.openwrt.ip
     const hostonlyif = await VBox.getAssignedHostonlyInf(config.virtualbox.vmName)
     const hostonlyInfIP = config.virtualbox.hostonlyInfIP

static/config-templates/config.json

@@ -1,5 +1,5 @@
 {
-    "version": "0.6",
+    "version": "0.5",
     "cfgDirName": "vrouter",
     "virtualbox": {
         "vmName": "vrouter",
@@ -38,8 +38,8 @@
                 "timeout": 600,
                 "method": "chacha20",
                 "fast_open": false,
-                "plugin": "none",
-                "plugin_obfs": ""
+                "plugin": "",
+                "plugin_opts": ""
             }
         },
         {
@@ -62,8 +62,8 @@
                 "timeout": 300,
                 "method": "chacha20",
                 "fast_open": false,
-                "plugin": "none",
-                "plugin_obfs": ""
+                "plugin": "",
+                "plugin_opts": ""
             },
             "kcptun": {
                 "server": "123.123.123.123",