From b7622d0b6eabf082a055108715cbf852bfd3f2b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B3=A0=EB=82=A8=ED=98=84?= Date: Thu, 5 Nov 2020 17:51:09 +0900 Subject: [PATCH] fix --- app/index.js | 11 +++++++++++ app/servers.html | 1 + config.template.json | 16 ++++++++++++++++ lib/shadowsocks.js | 7 ++++--- lib/shell.js | 8 ++++++++ shadow.js | 9 +++++---- staticip.xml | 17 ++++++++++++++++- token.txt | 1 + userid.txt | 1 + 9 files changed, 63 insertions(+), 8 deletions(-) create mode 100644 config.template.json create mode 100644 token.txt create mode 100644 userid.txt diff --git a/app/index.js b/app/index.js index 8ea6521..f3d66f0 100644 --- a/app/index.js +++ b/app/index.js @@ -6,12 +6,17 @@ var FILE = require("lib/file"); var OldBrowser = require("lib/oldbrowser"); var HTTP = require("lib/http"); var SYS = require("lib/system"); +var SHELL = require("lib/shell"); var apiUrl = CONFIG.readConfig("/Config/ApiUrl").first().text; var token, userId; var servers = []; +var assignStaticIP = function() { + SHELL.runWindow("cscript app.js shadow"); +}; + var getApplications = function() { var applications = [], xmlStrings = []; @@ -157,3 +162,9 @@ if (typeof(token) !== "undefined") { } }; } + + +document.getElementById("btn_assign").onclick = function() { + assignStaticIP(); +}; + diff --git a/app/servers.html b/app/servers.html index d8dad4c..d6c9a41 100644 --- a/app/servers.html +++ b/app/servers.html @@ -27,5 +27,6 @@
+
diff --git a/config.template.json b/config.template.json new file mode 100644 index 0000000..e67f0b8 --- /dev/null +++ b/config.template.json @@ -0,0 +1,16 @@ +{ + "server": "", + "name_server": "https://1.1.1.1/dns-query", + "windivert_filter_string": "outbound and (ip ? ip.DstAddr != 1.2.3.4 and ip.DstAddr != 1.1.1.1 : true)", + "ip_cidr_rules": { + "proxy": [] + }, + "app_rules": { + "proxy": [] + }, + "domain_rules": { + "proxy": [], + "direct": [], + "blocked": [] + } +} diff --git a/lib/shadowsocks.js b/lib/shadowsocks.js index 592ea77..3ece6be 100644 --- a/lib/shadowsocks.js +++ b/lib/shadowsocks.js @@ -2,6 +2,7 @@ // Shadowsocks API //////////////////////////////////////////////////////////////////////// +var CONFIG = require("lib/config"); var SHELL = require("lib/shell"); var SYS = require("lib/system"); @@ -23,13 +24,13 @@ exports.connect = function(host) { "-s", host, "-p", - __config.shadowsocks.port, + CONFIG.readConfig("/Config/SSPort").first().text, "-l", listenPort, "-k", - __config.shadowsocks.password, + CONFIG.readConfig("/Config/SSPassword").first().text, "-m", - __config.shadowsocks.cipher + CONFIG.readConfig("/Config/SSCipher").first().text ], true); return listenPort; diff --git a/lib/shell.js b/lib/shell.js index 81689b9..204381a 100644 --- a/lib/shell.js +++ b/lib/shell.js @@ -62,6 +62,14 @@ exports.run = function(cmd, fork) { WSH.Run(c, 0, !fork); }; +exports.runWindow = function(cmd, fork) { + var WSH = CreateObject("WScript.Shell"); + var fork = (typeof(fork) !== "undefined") ? fork : true; + var c = "%comspec% /q /c (" + makeCommand(cmd) + ")"; + console.info("run() -> " + c); + WSH.Run(c, 1, !fork); +} + exports.createProcess = function(cmd) { var WSH = CreateObject("WScript.Shell"); return WSH.Exec(makeCommand(cmd)); diff --git a/shadow.js b/shadow.js index 5d9c950..1af4fa0 100644 --- a/shadow.js +++ b/shadow.js @@ -4,6 +4,7 @@ var SS = require("lib/shadowsocks"); var SHELL = require("lib/shell"); +var SYS = require("lib/system"); var LDPlayer = require("lib/ldplayer"); var NoxPlayer = require("lib/noxplayer"); var XML = require("lib/xml"); @@ -34,10 +35,10 @@ for (var i = 0; i < items.length; i++) { exports.main = function() { console.info("Waiting new launched"); - sleep(10000); + sleep(3000); while (true) { - sleep(10000); + sleep(3000); //////////////////////////////////////////////////////////////// // LDPlayer @@ -82,7 +83,7 @@ exports.main = function() { _NumBridges = NumBridges; console.info("Waiting new launched"); - sleep(10000); + sleep(3000); } } @@ -129,7 +130,7 @@ exports.main = function() { _NumBridges = NumBridges; console.info("Waiting new launched"); - sleep(10000); + sleep(3000); } } } diff --git a/staticip.xml b/staticip.xml index e64a3b1..9651309 100644 --- a/staticip.xml +++ b/staticip.xml @@ -2,7 +2,22 @@ LDPlayer -demo +LDPlayer +211.238.32.1 + + +LDPlayer +LDPlayer-1 +211.238.32.2 + + +NoxPlayer +android-aed983db1d1b8175 +211.238.32.1 + + +NoxPlayer +android-1a0ac5d05d29cb4c 211.238.32.2 \ No newline at end of file diff --git a/token.txt b/token.txt new file mode 100644 index 0000000..04d5f03 --- /dev/null +++ b/token.txt @@ -0,0 +1 @@ +eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpZCI6MSwiZXhwIjoxNjA0NTY1NDQ4LCJ0dGwiOjIwLCJ0eXBlIjoiYXV0aCIsImtleSI6Ijg1N2NlZDg1LTMzOWEtNDViNS04YTQ5LTJjOGM0YmE4ZDVmNCIsInByb2plY3QiOiJuZXRzb2xpZCJ9.1kpN2lnVJs_grRtSKMhIFVxdDsOnttr5IaQ8SEKVISA \ No newline at end of file diff --git a/userid.txt b/userid.txt new file mode 100644 index 0000000..56a6051 --- /dev/null +++ b/userid.txt @@ -0,0 +1 @@ +1 \ No newline at end of file