new format and auto convert

rikaaa0928 · Feb 11, 2019 · 98ee787 · 98ee787
1 parent 2bc570b
commit 98ee787
Show file tree

Hide file tree

Showing 7 changed files with 177 additions and 87 deletions.
diff --git a/default.json b/default.json
@@ -1,49 +1,86 @@
 {
-	"inbound": {
-		"port": 0,
-		"listen": "0.0.0.0",
-		"protocol": "socks",
-		"settings": {
-			"auth": "noauth",
-			"udp": true,
-			"ip": "127.0.0.1"
-		},
-		"domainOverride": [
-			"http",
-			"tls"
+	"dns": {
+		"servers": [
+			""
 		]
 	},
-	"outbound": {
-		"tag": "",
-		"protocol": "vmess",
+	"routing": {
+		"strategy": "rules",
 		"settings": {
-			"vnext": [
+			"domainStrategy": "IPIfNonMatch",
+			"rules": [
 				{
-					"address": "",
-					"port": 0,
-					"users": [
-						{
-							"id": "",
-							"alterId": 0,
-							"security": "aes-128-gcm"
-						}
+					"type": "field",
+					"port": null,
+					"outboundTag": "direct",
+					"ip": [
+						"0.0.0.0/0"
 					]
 				}
 			]
+		}
+	},
+	"inbounds": [
+		{
+			"port": 0,
+			"listen": "0.0.0.0",
+			"protocol": "socks",
+			"settings": {
+				"auth": "noauth",
+				"udp": true,
+				"ip": "127.0.0.1"
+			},
+			"domainOverride": [
+				"http",
+				"tls"
+			]
 		},
-		"streamSettings": {
-			"network": "ws",
-			"security": "",
-			"wsSettings": {
-				"connectionReuse": true,
-				"path": ""
+		{
+			"port": 1,
+			"listen": "0.0.0.0",
+			"protocol": "http",
+			"settings": {
+				"auth": "noauth",
+				"udp": true,
+				"ip": "127.0.0.1"
+			},
+			"domainOverride": [
+				"http",
+				"tls"
+			]
+		}
+	],
+	"outbounds": [
+		{
+			"tag": "",
+			"protocol": "vmess",
+			"settings": {
+				"vnext": [
+					{
+						"address": "",
+						"port": 0,
+						"users": [
+							{
+								"id": "",
+								"alterId": 0,
+								"security": "aes-128-gcm"
+							}
+						]
+					}
+				]
+			},
+			"streamSettings": {
+				"network": "ws",
+				"security": "",
+				"wsSettings": {
+					"connectionReuse": true,
+					"path": ""
+				}
+			},
+			"mux": {
+				"enabled": true
 			}
 		},
-		"mux": {
-			"enabled": true
-		}
-	},
-	"outboundDetour": [
 		{
 			"protocol": "freedom",
 			"settings": {},
@@ -58,26 +95,5 @@
 			},
 			"tag": ""
 		}
-	],
-	"dns": {
-		"servers": [
-			""
-		]
-	},
-	"routing": {
-		"strategy": "rules",
-		"settings": {
-			"domainStrategy": "IPIfNonMatch",
-			"rules": [
-				{
-					"type": "field",
-					"port": null,
-					"outboundTag": "direct",
-					"ip": [
-						"0.0.0.0/0"
-					]
-				}
-			]
-		}
-	}
+	]
 }
diff --git a/main.1.js b/main.1.js
@@ -17,7 +17,7 @@ function createWindow() {
     width: 800,
     height: 600,
     transparent: false,
-    frame: false,
+    frame: true,
     minWidth: 400
   })
 

diff --git a/main.js b/main.js
@@ -19,7 +19,7 @@ app.on('before-quit', function () {
 });
 
 function createWindow() {
-  tray = new Tray(path.join(__dirname, 'logo.ico'))
+  tray = new Tray(path.join(__dirname, 'logo.ico'));
 
   // Create the browser window.
   mainWindow = new BrowserWindow({
@@ -28,14 +28,14 @@ function createWindow() {
     transparent: false,
     frame: false,
     minWidth: 400
-  })
+  });
 
   // and load the index.html of the app.
   mainWindow.loadURL(url.format({
     pathname: path.join(__dirname, 'index.html'),
     protocol: 'file:',
     slashes: true
-  }))
+  }));
 
   const contextMenu = Menu.buildFromTemplate([{
       label: 'Show App',
@@ -51,11 +51,14 @@ function createWindow() {
       }
     }
   ]);
-  tray.setToolTip('V2ray Electron')
-  tray.setContextMenu(contextMenu)
+  tray.on('double-click', () => {
+    mainWindow.show()
+  });
+  tray.setToolTip('V2ray Electron');
+  tray.setContextMenu(contextMenu);
 
-  mainWindow.on('resize', updateReply)
-  mainWindow.on('move', updateReply)
+  mainWindow.on('resize', updateReply);
+  mainWindow.on('move', updateReply);
 
   function updateReply() {
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "v2ray_electron",
     "productName": "v2ray electron client",
-    "version": "0.1.0",
+    "version": "0.2.0",
     "main": "main.js",
     "devDependencies": {
         "electron": "4.0.1",

diff --git a/renderer.js b/renderer.js
@@ -16,8 +16,8 @@ if (remote.process.env.PORTABLE_EXECUTABLE_DIR == undefined) {
 } else {
     PORTABLE_EXECUTABLE_DIR = remote.process.env.PORTABLE_EXECUTABLE_DIR
 }
-let guiCOnfigFilePath = path.join(PORTABLE_EXECUTABLE_DIR, 'guiConfig.json');
-let guiConfig = parseConfigFile(guiCOnfigFilePath);
+let guiConfigFilePath = path.join(PORTABLE_EXECUTABLE_DIR, 'guiConfig.json');
+let guiConfig = parseConfigFile(guiConfigFilePath);
 const tbody = $("tbody");
 let runningProcess = [];
 const tmp = tbody.html();
@@ -55,7 +55,7 @@ $("body").on("click", function () {
 });
 
 function init() {
-    guiConfig = parseConfigFile(guiCOnfigFilePath);
+    guiConfig = parseConfigFile(guiConfigFilePath);
     updateList(guiConfig);
 }
 
@@ -67,6 +67,31 @@ if (guiConfig.auto != undefined && guiConfig.auto >= 0) {
     startServer(fileName, i);
 }
 
+function getPorts(conf) {
+    if (conf.inbound != undefined) {
+        return conf.inbound.listen + ":" + conf.inbound.port;
+    } else if (conf.inbounds != undefined) {
+        let str = "";
+        for (let i = 0; i < conf.inbounds.length; i++) {
+            switch (conf.inbounds[i].protocol) {
+                case "http":
+                    str += "H:" + conf.inbounds[i].port + ";";
+                    break;
+                case "socks":
+                    str += "S:" + conf.inbounds[i].port + ";";
+                    break;
+                default:
+                    str += "?:" + conf.inbounds[i].port + ";";
+            }
+        }
+        if (str.length > 0) {
+            str = str.substring(0, str.length - 1);
+        }
+        return str;
+    }
+    return "undefined";
+}
+
 function updateList(obj) {
     //let ftr = $("tbody tr:first");
     tbody.html("");
@@ -78,7 +103,7 @@ function updateList(obj) {
         tds.eq(0)[0].innerText = obj.servers[i].name;
         let conf = parseConfigFile(path.join(PORTABLE_EXECUTABLE_DIR, obj.servers[i].file));
         try {
-            tds.eq(1)[0].innerText = conf.inbound.listen + ":" + conf.inbound.port;
+            tds.eq(1)[0].innerText = getPorts(conf);
         } catch {
             tds.eq(1)[0].innerText = "undefined";
         }
@@ -114,7 +139,7 @@ function updateList(obj) {
 function deleteConfig(i) {
     fs.unlinkSync(path.join(PORTABLE_EXECUTABLE_DIR, guiConfig.servers[i].file));
     guiConfig.servers.splice(i, 1);
-    saveToFile(guiCOnfigFilePath, JSON.stringify(guiConfig, null, '\t'));
+    saveToFile(guiConfigFilePath, JSON.stringify(guiConfig, null, '\t'));
     init();
 }
 

diff --git a/struct.json b/struct.json
@@ -5,7 +5,7 @@
             "error": "",
             "loglevel": "warning"
         },
-        "inbound": {
+        "inbounds": [{
             "port": 0,
             "listen": "",
             "protocol": "socks",
@@ -17,8 +17,8 @@
             "domainOverride": [
                 ""
             ]
-        },
-        "outbound": {
+        }],
+        "outbounds": [{
             "tag": "",
             "protocol": "vmess",
             "settings": {
@@ -46,7 +46,6 @@
             "mux": {
                 "enabled": true
             }
-        },
-        "inboundDetour": ["ref:root:inbound"]
+        }]
     }
 }