Skip to content

Commit

Permalink
core update
Browse files Browse the repository at this point in the history
  • Loading branch information
rikaaa0928 committed Mar 2, 2019
1 parent 4426d33 commit b55cce7
Show file tree
Hide file tree
Showing 9 changed files with 496 additions and 245 deletions.
97 changes: 0 additions & 97 deletions default.json
Original file line number Diff line number Diff line change
@@ -1,99 +1,2 @@
{
"dns": {
"servers": [
""
]
},
"routing": {
"strategy": "rules",
"settings": {
"domainStrategy": "IPIfNonMatch",
"rules": [
{
"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"
]
},
{
"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
}
},
{
"protocol": "freedom",
"settings": {},
"tag": ""
},
{
"protocol": "blackhole",
"settings": {
"response": {
"type": "http"
}
},
"tag": ""
}
]
}
2 changes: 1 addition & 1 deletion guiConfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"name": "new.1"
}
],
"auto": 1,
"auto": 0,
"startup": true,
"min": false
}
14 changes: 10 additions & 4 deletions log.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,27 @@ ipc.send('allLog', "all");

ipc.on('initLog', (event, arg) => {
if (!Array.isArray(arg)) {
appendLog(arg);
appendInitLog(arg);
return
}
for (let i = 0; i < arg.length; i++) {
appendLog(arg[i]);
appendInitLog(arg[i]);
}
let card = $(".card")[0];
card.scrollTop = card.scrollHeight - card.clientHeight;
});

ipc.on('newLog', (event, arg) => {
appendLog(arg);
});

$(".card-body").html("");
let card = $(".card")[0];
card.scrollTop = card.scrollHeight - card.clientHeight;

function appendInitLog(log) {
let h = $(".card-body").html();
let card = $(".card")[0];
$(".card-body").html(h + `<p>${log}</p>`);
}

function appendLog(log) {
let h = $(".card-body").html();
Expand Down
1 change: 0 additions & 1 deletion main.1.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ const app = electron.app
const BrowserWindow = electron.BrowserWindow

const path = require('path');
const url = require('url');

// Keep a global reference of the window object, if you don't, the window will
// be closed automatically when the JavaScript object is garbage collected.
Expand Down
6 changes: 6 additions & 0 deletions main.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,12 @@ function createWindow() {
mainWindow.show()
}
},
{
label: 'Update/Install Core',
click: function () {
mainWindow.webContents.send('update', 'update');
}
},
{
label: 'Log',
click: function () {
Expand Down
Loading

0 comments on commit b55cce7

Please sign in to comment.