Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f330daf242 | ||
|
|
9e2d9d5abc | ||
|
|
b14615f339 | ||
|
|
899f554336 | ||
|
|
7b5c3717ba | ||
|
|
38d369bb58 | ||
|
|
0ea415ae78 | ||
|
|
5c6dc47d47 |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1,2 +1,3 @@
|
||||
*.crx
|
||||
*.log
|
||||
build
|
||||
|
||||
7
build.sh
Normal file → Executable file
7
build.sh
Normal file → Executable file
@@ -1 +1,6 @@
|
||||
google-chrome --pack-extension=./chromeproxy --pack-extension-key=./chromeproxy.pem
|
||||
rm build/ -rf
|
||||
mkdir -p ./build
|
||||
cd proxyserver && go build && mv proxyserver ../build/ && cd ..
|
||||
cp start.sh build/start.sh
|
||||
cp stop.sh build/stop.sh
|
||||
cp proxyserver/config.yaml build/config.yaml
|
||||
|
||||
2
build_crx.sh
Executable file
2
build_crx.sh
Executable file
@@ -0,0 +1,2 @@
|
||||
|
||||
google-chrome --pack-extension=./chromeproxy --pack-extension-key=./chromeproxy.pem
|
||||
1
chromeproxy/.vscode/launch.json
vendored
1
chromeproxy/.vscode/launch.json
vendored
@@ -14,6 +14,7 @@
|
||||
"--ignore-certificate-errors",
|
||||
"--disable-dev-shm-usage",
|
||||
"--mute-audio",
|
||||
"--single-process",
|
||||
"--safebrowsing-disable-auto-update",
|
||||
"--disable-gpu",
|
||||
"--no-sandbox",
|
||||
|
||||
40
chromeproxy/background/capture.js
Normal file
40
chromeproxy/background/capture.js
Normal file
@@ -0,0 +1,40 @@
|
||||
|
||||
function Tell(backgroundType, content) {
|
||||
try {
|
||||
if (content == undefined) {
|
||||
chrome.runtime.sendMessage({ type: backgroundType });
|
||||
} else {
|
||||
chrome.runtime.sendMessage({ type: backgroundType, content: content });
|
||||
}
|
||||
} catch (error) {
|
||||
console.log(error);
|
||||
window.location.href = Host;
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
if (condition == undefined) {
|
||||
condition = function () {
|
||||
return true;
|
||||
};
|
||||
}
|
||||
} catch (error) {
|
||||
condition = function () {
|
||||
return true;
|
||||
};
|
||||
}
|
||||
|
||||
var href = window.location.href;
|
||||
var content = "";
|
||||
if(document.contentType == "application/json") {
|
||||
content = document.documentElement.innerText;
|
||||
} else {
|
||||
content = document.documentElement.innerHTML;
|
||||
}
|
||||
|
||||
if (condition()) {
|
||||
Tell("content", content);
|
||||
} else {
|
||||
Tell("notwant", content);
|
||||
}
|
||||
|
||||
41
chromeproxy/background/config.js
Normal file
41
chromeproxy/background/config.js
Normal file
@@ -0,0 +1,41 @@
|
||||
// 配置使用的监听
|
||||
chrome.webRequest.onBeforeRequest.addListener(function (details) {
|
||||
if (details.url.startsWith("http://eson.config")) {
|
||||
var params = new URL(details.url).searchParams;
|
||||
|
||||
for( key of params.keys()) {
|
||||
switch(key) {
|
||||
case "proxyserver":
|
||||
ProxyServer = params.get(key)
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
var taskurl = params.get("taskurl")
|
||||
if(taskurl !== "") {
|
||||
UpdateHost(taskurl)
|
||||
removeConfigTabAndCreateGetTaskTab(details);
|
||||
}
|
||||
|
||||
return { cancel: true };
|
||||
}
|
||||
}, { 'urls': ["<all_urls>"] }, ['blocking']);
|
||||
|
||||
|
||||
function removeConfigTabAndCreateGetTaskTab(details) {
|
||||
chrome.tabs.remove(details.tabId);
|
||||
chrome.tabs.query({ currentWindow: true }, function (tabs) {
|
||||
var count = 0
|
||||
for (var tab of tabs) {
|
||||
if (!tab.url.startsWith("chrome://")) {
|
||||
count++;
|
||||
chrome.tabs.executeScript(tab.id, { runAt: "document_end", code: `window.location.href = "${Host}"` })
|
||||
} else {
|
||||
chrome.tabs.remove(tab.id);
|
||||
}
|
||||
}
|
||||
for (var i = count; i < WorkerNumber; i++) {
|
||||
chrome.tabs.create({ url: `${Host}` });
|
||||
}
|
||||
})
|
||||
}
|
||||
21
chromeproxy/background/proxy.js
Normal file
21
chromeproxy/background/proxy.js
Normal file
@@ -0,0 +1,21 @@
|
||||
|
||||
|
||||
var config = {
|
||||
mode: "pac_script",
|
||||
pacScript: {
|
||||
data:
|
||||
`
|
||||
ProxyServer = ${ProxyServer};
|
||||
function FindProxyForURL(url, host) {
|
||||
if(ProxyServer != undefined) {
|
||||
return ProxyServer;
|
||||
}
|
||||
return 'DIRECT';
|
||||
}`
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
chrome.proxy.settings.set(
|
||||
{ value: config, scope: 'regular' },
|
||||
function () { });
|
||||
@@ -1,38 +1,105 @@
|
||||
console.log("background");
|
||||
|
||||
var task_manager = {
|
||||
}
|
||||
|
||||
chrome.runtime.onMessage.addListener(function (request, sender, sendResponse) {
|
||||
sendResponse({});
|
||||
switch (request.type) {
|
||||
case BackgroundMsgType.CONTENT:
|
||||
FinishTask(sender, request.content);
|
||||
break;
|
||||
case BackgroundMsgType.ERROR:
|
||||
ErrorTask(sender, request.error)
|
||||
break;
|
||||
case BackgroundMsgType.GETTASK:
|
||||
GetTask(sender);
|
||||
break;
|
||||
case BackgroundMsgType.NOTWANT:
|
||||
task = task_manager[sender.tab.id];
|
||||
|
||||
if(task.data.waitcapture != undefined) {
|
||||
setTimeout(function(){
|
||||
CaptureContentCurrentPage(sender.tab.id);
|
||||
}, task.data.waitcapture);
|
||||
} else {
|
||||
|
||||
task.data.retry --;
|
||||
if(task.data.retry >= 0) {
|
||||
setTimeout(function(){
|
||||
CaptureContent(task);
|
||||
}, 6000)
|
||||
} else {
|
||||
ErrorTask(sender, request.content);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
break;
|
||||
case BackgroundMsgType.CLOSETAB:
|
||||
delete task_manager[sender.tab.id]
|
||||
chrome.tabs.remove(sender.tab.id);
|
||||
default:
|
||||
break;
|
||||
}
|
||||
});
|
||||
|
||||
function GetTask(sender) {
|
||||
fetch(GetTaskUrl).then(function (response) {
|
||||
if (response.ok) {
|
||||
response.json().then(function (task) {
|
||||
if(task.code == 200) {
|
||||
task_manager[sender.tab.id] = task;
|
||||
chrome.tabs.executeScript(sender.tab.id, {runAt: "document_end", code: `window.location.href = "${task.data.url}"` }, function (results) {
|
||||
})
|
||||
Tell(sender, InjectMsgType.FETCH);
|
||||
} else {
|
||||
Tell(sender, InjectMsgType.NOTASK);
|
||||
}
|
||||
CaptureContent(task);
|
||||
})
|
||||
} else {
|
||||
// ErrorTask(sender, "error response:" + response.text())
|
||||
console.log("error response:",response.text())
|
||||
console.log("error response:", response.text())
|
||||
ErrorTask(sender, response.text());
|
||||
}
|
||||
}).catch(function (reason) {
|
||||
console.log(reason);
|
||||
// GetTask();
|
||||
ErrorTask(sender, reason);
|
||||
})
|
||||
}
|
||||
|
||||
function CaptureContentCurrentPage(tabid) {
|
||||
chrome.tabs.executeScript(tabid, { runAt: "document_end", file: "background/capture.js" });
|
||||
}
|
||||
|
||||
function CaptureContent(task) {
|
||||
if (task.code == 200) {
|
||||
|
||||
if(task.data.retry == undefined) {
|
||||
task.data.retry = 1;
|
||||
}
|
||||
|
||||
chrome.tabs.create({ url: task.data.url }, function (tab) {
|
||||
task_manager[tab.id] = task;
|
||||
if (task.data.content_condition) {
|
||||
condition = `${task.data.content_condition}`;
|
||||
} else {
|
||||
condition = undefined;
|
||||
}
|
||||
|
||||
if (condition != undefined) {
|
||||
chrome.tabs.executeScript(tab.id, { runAt: "document_start", code: condition }, function () {
|
||||
CaptureContentCurrentPage(tab.id)
|
||||
});
|
||||
} else {
|
||||
CaptureContentCurrentPage(tab.id)
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
function FinishTask(sender, content) {
|
||||
var task = task_manager[sender.tab.id];
|
||||
|
||||
var formdata = new FormData();
|
||||
|
||||
formdata.append("taskid", task.data.taskid);
|
||||
formdata.append("content", content);
|
||||
// console.log(task.data.taskid);
|
||||
fetch(FinishTaskUrl, {method: "POST", body: formdata }).then(function (response) {
|
||||
|
||||
delete task_manager[sender.tab.id];
|
||||
chrome.tabs.remove(sender.tab.id);
|
||||
fetch(FinishTaskUrl, { method: "POST", body: formdata }).then(function (response) {
|
||||
if (response.ok) {
|
||||
response.json().then(function (value) {
|
||||
if (value.code == 200) {
|
||||
@@ -41,11 +108,9 @@ function FinishTask(sender, content) {
|
||||
}
|
||||
});
|
||||
}
|
||||
}).catch(function(error){
|
||||
// TODO: 汇报错误
|
||||
// ErrorTask(sender, error);
|
||||
}).catch(function (error) {
|
||||
ErrorTask(sender, error);
|
||||
console.log(error)
|
||||
// GetTask(sender);
|
||||
return;
|
||||
});
|
||||
}
|
||||
@@ -55,51 +120,23 @@ function ErrorTask(sender, error) {
|
||||
var formdata = new FormData();
|
||||
formdata.append("taskid", task.data.taskid);
|
||||
formdata.append("error", error);
|
||||
fetch(ErrorTaskUrl, {method: "POST", body: formdata});
|
||||
fetch(ErrorTaskUrl, { method: "POST", body: formdata }, function (response) {
|
||||
if (response.ok) {
|
||||
response.json().then(function (value) {
|
||||
if (value.code == 200) {
|
||||
GetTask(sender);
|
||||
return
|
||||
}
|
||||
});
|
||||
}
|
||||
}).then().catch(function (error) {
|
||||
console.log(error)
|
||||
return;
|
||||
});
|
||||
}
|
||||
|
||||
chrome.runtime.onMessage.addListener(function (request, sender, sendResponse) {
|
||||
sendResponse({});
|
||||
switch (request.type) {
|
||||
case BackgroundMsgType.CONTENT:
|
||||
// 重新获取任务
|
||||
FinishTask(sender, request.content);
|
||||
break;
|
||||
case BackgroundMsgType.ERROR:
|
||||
// 重新获取任务
|
||||
ErrorTask(sender, request.error)
|
||||
GetTask(sender);
|
||||
break;
|
||||
case BackgroundMsgType.GETTASK:
|
||||
GetTask(sender);
|
||||
break;
|
||||
case BackgroundMsgType.NOTWANT:
|
||||
Tell(sender,InjectMsgType.WAIT);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
});
|
||||
|
||||
function Tell(sender, jnjectType) {
|
||||
try {
|
||||
chrome.tabs.sendMessage(sender.tab.id , {type: jnjectType})
|
||||
} catch (error) {
|
||||
console.log(error);
|
||||
}
|
||||
}
|
||||
|
||||
// 配置使用的监听
|
||||
chrome.webRequest.onBeforeRequest.addListener(function (details) {
|
||||
if (details.url.startsWith("http://eson.config")) {
|
||||
var params = new URLSearchParams(details.url)
|
||||
UpdateHost(params.get("taskurl"))
|
||||
chrome.tabs.remove(details.tabId, function () { });
|
||||
chrome.tabs.query({currentWindow: true}, function(tabs) {
|
||||
for( tab in tabs) {
|
||||
console.log(tab);
|
||||
}
|
||||
})
|
||||
return { cancel: true };
|
||||
}
|
||||
}, { 'urls': ["<all_urls>"] }, ['blocking']);
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1,15 +1,19 @@
|
||||
|
||||
var Host = "http://localhost:7123"
|
||||
|
||||
var GetTaskUrl = `${Host}/task/get`;
|
||||
var FinishTaskUrl = `${Host}/task/content`;
|
||||
var ErrorTaskUrl = `${Host}/task/error`;
|
||||
var ConfigUrl = `${Host}/task/config`
|
||||
|
||||
var WorkerNumber = 1;
|
||||
var ProxyServer = undefined;
|
||||
|
||||
function UpdateHost(host) {
|
||||
Host = host
|
||||
GetTaskUrl = `${Host}/task/get`
|
||||
FinishTaskUrl = `${Host}/task/content`
|
||||
ErrorTaskUrl = `${Host}/task/error`
|
||||
ConfigUrl = `${Host}/task/config`
|
||||
}
|
||||
|
||||
const BackgroundMsgType = {
|
||||
@@ -17,14 +21,16 @@ const BackgroundMsgType = {
|
||||
CONTENT: 'content',
|
||||
GETTASK: 'gettask',
|
||||
TIMEOUT: 'timeout',
|
||||
CLOSETAB: 'closetab',
|
||||
ERROR: 'error',
|
||||
OK: 'ok',
|
||||
};
|
||||
|
||||
const InjectMsgType = {
|
||||
FETCH: 'fetch',
|
||||
WAIT: 'wait',
|
||||
ERROR: 'error',
|
||||
NOTASK: 'notask',
|
||||
OK: 'ok',
|
||||
};
|
||||
// const InjectMsgType = {
|
||||
// FETCH: 'fetch',
|
||||
// WAIT: 'wait',
|
||||
// ERROR: 'error',
|
||||
// NOTASK: 'notask', // 没有任务
|
||||
// CAPTURE: "capture", // 捕获内容
|
||||
// OK: 'ok',
|
||||
// };
|
||||
|
||||
@@ -1,47 +1,22 @@
|
||||
|
||||
|
||||
chrome.runtime.onMessage.addListener(function (request) {
|
||||
switch(request.type) {
|
||||
case InjectMsgType.WAIT:
|
||||
setTimeout(function(){
|
||||
GetTask();
|
||||
}, 6000);
|
||||
break;
|
||||
case InjectMsgType.NOTASK:
|
||||
setTimeout(function(){
|
||||
GetTask();
|
||||
}, 4000);
|
||||
break;
|
||||
case InjectMsgType.FETCH:
|
||||
setTimeout(function(){
|
||||
GetTask();
|
||||
}, 6000)
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
};
|
||||
});
|
||||
|
||||
|
||||
var href = window.location.href;
|
||||
var content = document.documentElement.innerHTML;
|
||||
if (href.startsWith("https://playerduo.com") && content.startsWith('<head></head><body><pre style="word-wrap: break-word; white-space: pre-wrap;">')) {
|
||||
Tell(BackgroundMsgType.CONTENT, content);
|
||||
if(href.startsWith(Host)) {
|
||||
setInterval(function(){
|
||||
GetTask();
|
||||
}, 1);
|
||||
} else {
|
||||
Tell(BackgroundMsgType.NOTWANT, content);
|
||||
}
|
||||
|
||||
function Tell(backgroundType, content) {
|
||||
if(content == undefined) {
|
||||
chrome.runtime.sendMessage({type: backgroundType});
|
||||
} else {
|
||||
chrome.runtime.sendMessage({type: backgroundType, content: content});
|
||||
}
|
||||
setTimeout(function(){
|
||||
chrome.runtime.sendMessage({ type: BackgroundMsgType.CLOSETAB })
|
||||
}, 15000)
|
||||
}
|
||||
|
||||
function GetTask() {
|
||||
Tell(BackgroundMsgType.GETTASK);
|
||||
}
|
||||
try {
|
||||
chrome.runtime.sendMessage({ type: BackgroundMsgType.GETTASK }, function(){});
|
||||
} catch (error) {
|
||||
console.log(error);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -2,10 +2,13 @@
|
||||
"background": {
|
||||
"scripts": [
|
||||
"base.js",
|
||||
"background/config.js",
|
||||
"background/worker.js"
|
||||
]
|
||||
},
|
||||
"devtools_page": "devtools.html",
|
||||
"web_accessible_resources": [
|
||||
"background/capture.js"
|
||||
],
|
||||
"browser_action": {
|
||||
"default_icon": {
|
||||
"16": "static/icons/16.png",
|
||||
@@ -36,7 +39,7 @@
|
||||
"key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlurgt0Ykv740tjk1ebeiSX6UVVRRhxVvh+FvRMTe9PKzkAKUDEW2IjNUz1swxZA8ILnMvtyamAfiErTOxUFB8+zCADU/CK2YEhqUJo3tmHCg6EP2XJL220ZXjmIeft1AqJV1BmGRLhm8VnH8dJ2EThfcflx4JEdlh0/aLJr6UVjF2hPVX8JLAMTVjEfiC82KDNGgXDADqBm3E/6n+Dx+3KhgIYTXKIMk+qRVaOhjAJLh8a9OrDBwpylP5RDifTAyVVa9UOyoLNqynzC9oLabWUr1ovWAOiivhYknFCXnl5q971iNSFpmjc+ZW+aK+TRjMnJF84IeA170corVG3KgnwIDAQAB",
|
||||
"manifest_version": 2,
|
||||
"name": "ChromeProxy",
|
||||
"permissions": ["background", "http://*/*", "https://*/*", "storage","tabs" , "activeTab", "webRequest", "webRequestBlocking", "<all_urls>", "webNavigation"],
|
||||
"permissions": ["background", "http://*/*", "https://*/*", "proxy", "storage","tabs" , "activeTab", "webRequest", "webRequestBlocking", "<all_urls>", "webNavigation"],
|
||||
"short_name": "ChromeProxy",
|
||||
"version": "0.1.0"
|
||||
}
|
||||
|
||||
1
chromeproxy/pac.js
Normal file
1
chromeproxy/pac.js
Normal file
@@ -0,0 +1 @@
|
||||
|
||||
@@ -15,6 +15,28 @@ func CallbackServer(task *Task) {
|
||||
}
|
||||
}()
|
||||
|
||||
task.lock.Lock()
|
||||
defer task.lock.Unlock()
|
||||
if callback, ok := task.data["callback"]; ok {
|
||||
cburl := callback.(string)
|
||||
_, err := requests.NewSession().Post(cburl).SetBodyAuto(task.data, requests.TypeFormData).Execute()
|
||||
if err != nil {
|
||||
log.Println(err)
|
||||
task.data["error"] = fmt.Sprintf("callback url error: %s", err)
|
||||
} else {
|
||||
task.data["status"] = "readied"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ErrorCallbackServer 错误处理回调客户端
|
||||
func ErrorCallbackServer(task *Task) {
|
||||
defer func() {
|
||||
if err := recover(); err != nil {
|
||||
log.Println(err)
|
||||
}
|
||||
}()
|
||||
|
||||
task.lock.Lock()
|
||||
defer task.lock.Unlock()
|
||||
if callback, ok := task.data["callback"]; ok {
|
||||
|
||||
@@ -7,7 +7,7 @@ import (
|
||||
"gopkg.in/yaml.v2"
|
||||
)
|
||||
|
||||
var config = &Config{}
|
||||
var config = &LocalConfig{}
|
||||
|
||||
func init() {
|
||||
f, err := os.Open("config.yaml")
|
||||
@@ -21,8 +21,8 @@ func init() {
|
||||
}
|
||||
}
|
||||
|
||||
// Config 本地yaml配置对象
|
||||
type Config struct {
|
||||
// LocalConfig 本地yaml配置对象
|
||||
type LocalConfig struct {
|
||||
Server struct {
|
||||
URI string `yaml:"uri"`
|
||||
} `yaml:"server"`
|
||||
@@ -41,3 +41,8 @@ func initChromeProxy() {
|
||||
panic(err)
|
||||
}
|
||||
}
|
||||
|
||||
// ChromeConfig chrome的配置, 包括代理
|
||||
type ChromeConfig struct {
|
||||
PacScript string
|
||||
}
|
||||
|
||||
@@ -3,8 +3,8 @@ module git.nonolive.co/eson.hsm/proxyserver
|
||||
go 1.15
|
||||
|
||||
require (
|
||||
github.com/474420502/focus v0.12.0
|
||||
github.com/474420502/requests v1.10.0
|
||||
github.com/474420502/focus v0.13.1
|
||||
github.com/474420502/requests v1.10.1
|
||||
github.com/bwmarrin/snowflake v0.3.0
|
||||
github.com/gin-gonic/gin v1.6.3
|
||||
github.com/go-playground/validator/v10 v10.4.1 // indirect
|
||||
|
||||
@@ -1,8 +1,14 @@
|
||||
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
|
||||
github.com/474420502/focus v0.12.0 h1:+icbmj7IEOefvTegHt5EpcHt6WFbe2miIrceUJx2Evo=
|
||||
github.com/474420502/focus v0.12.0/go.mod h1:d0PMjtMxFz1a9HIhwyFPkWa+JF+0LgOrEUfd8iZka6s=
|
||||
github.com/474420502/focus v0.13.0 h1:68G0txM38EinNitcfpP0752k8tF4JRJ0r1mmdH6FoGc=
|
||||
github.com/474420502/focus v0.13.0/go.mod h1:d0PMjtMxFz1a9HIhwyFPkWa+JF+0LgOrEUfd8iZka6s=
|
||||
github.com/474420502/focus v0.13.1 h1:HwJCqY60eqRAkwKtIefJib1ofBfcvVh5ZTU2xE8Gmkk=
|
||||
github.com/474420502/focus v0.13.1/go.mod h1:SrqNq63qSx53TkvVWOuHTbTSvAQTNO8ZUrufXm0Ncq8=
|
||||
github.com/474420502/requests v1.10.0 h1:Oz7+Nx+1iuJJUjbBH3cVmkDVosF2tyq5d72TMAoQH8I=
|
||||
github.com/474420502/requests v1.10.0/go.mod h1:SB8/RIUVWF3AGotuq/mATUwAjXzzlV7iWaBNM3+c06c=
|
||||
github.com/474420502/requests v1.10.1 h1:k5qK8ZWPIdrG0EurJuK2hhoYFbJ9GJTe0xvrzESMFLo=
|
||||
github.com/474420502/requests v1.10.1/go.mod h1:SB8/RIUVWF3AGotuq/mATUwAjXzzlV7iWaBNM3+c06c=
|
||||
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
|
||||
github.com/Pallinder/go-randomdata v1.1.0/go.mod h1:yHmJgulpD2Nfrm0cR9tI/+oAgRqCQQixsA8HyRZfV9Y=
|
||||
github.com/bwmarrin/snowflake v0.3.0 h1:xm67bEhkKh6ij1790JB83OujPR5CzNe8QuQqAgISZN0=
|
||||
@@ -125,6 +131,7 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w
|
||||
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
|
||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
|
||||
golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
|
||||
|
||||
@@ -4,6 +4,7 @@ import (
|
||||
"fmt"
|
||||
"log"
|
||||
"net/http"
|
||||
"strconv"
|
||||
"time"
|
||||
|
||||
"github.com/bwmarrin/snowflake"
|
||||
@@ -41,10 +42,9 @@ func init() {
|
||||
task := engine.Group("/task")
|
||||
task.GET("/get", GetTask)
|
||||
task.POST("/put", PutTask)
|
||||
|
||||
task.POST("/content", ContentTask)
|
||||
|
||||
task.POST("/error", ErrorTask)
|
||||
task.GET("/config", GetConfig)
|
||||
|
||||
task.GET("/ready", ReadyTask)
|
||||
task.POST("/ack", AckTask)
|
||||
@@ -70,14 +70,33 @@ func PutTask(c *gin.Context) {
|
||||
now := time.Now()
|
||||
tid := snowNode.Generate().Base64()
|
||||
label := c.PostForm("label")
|
||||
data.Store("taskid", tid)
|
||||
data.Store("url", u)
|
||||
data.Store("ts", now.UnixNano())
|
||||
data.Store("label", label)
|
||||
|
||||
if carrayhash := c.PostForm("carrayhash"); carrayhash != "" {
|
||||
data.Store("carrayhash", carrayhash)
|
||||
}
|
||||
|
||||
if callback := c.PostForm("callback"); callback != "" {
|
||||
data.Store("callback", callback)
|
||||
}
|
||||
|
||||
data.Store("taskid", tid)
|
||||
data.Store("url", u)
|
||||
data.Store("ts", now.UnixNano())
|
||||
data.Store("label", label)
|
||||
data.Store("content_condition", c.PostForm("content_condition"))
|
||||
|
||||
if waitcapture, err := strconv.Atoi(c.PostForm("waitcapture")); err != nil {
|
||||
data.Store("waitcapture", 1)
|
||||
} else {
|
||||
data.Store("waitcapture", waitcapture)
|
||||
}
|
||||
|
||||
if retry, err := strconv.Atoi(c.PostForm("retry")); err != nil {
|
||||
data.Store("retry", 1)
|
||||
} else {
|
||||
data.Store("retry", retry)
|
||||
}
|
||||
|
||||
taskQueue.Push(tid, data)
|
||||
oplog.Write(data)
|
||||
c.JSON(http.StatusOK, Response{Code: 200, Message: "ok", Data: data})
|
||||
@@ -103,7 +122,6 @@ func ContentTask(c *gin.Context) {
|
||||
task.Store("status", "ready")
|
||||
readyQueue.Push(tid, task) // 进入回调发送队列.TODO: 内容持久化
|
||||
c.JSON(200, Response{Code: 200, Data: task})
|
||||
// log.Println("start callback")
|
||||
if label, ok := task.Load("label"); ok {
|
||||
log.Println(label.(string), tid)
|
||||
}
|
||||
@@ -155,6 +173,11 @@ func ReadyTask(c *gin.Context) {
|
||||
c.JSON(http.StatusOK, Response{Code: 404, Message: fmt.Sprintf("taskid: %s is not found", tid)})
|
||||
}
|
||||
|
||||
// GetConfig 获取任务配置
|
||||
func GetConfig(c *gin.Context) {
|
||||
|
||||
}
|
||||
|
||||
// ErrorTask 任务错误无法完成
|
||||
func ErrorTask(c *gin.Context) {
|
||||
tid := c.PostForm("taskid")
|
||||
@@ -164,6 +187,8 @@ func ErrorTask(c *gin.Context) {
|
||||
task.Store("error", errorStr)
|
||||
errorQueue.Push(tid, task) // 进入回调发送队列.TODO: 内容持久化
|
||||
c.JSON(http.StatusOK, Response{Code: 200})
|
||||
// log.Println(errorStr)
|
||||
go ErrorCallbackServer(task)
|
||||
return
|
||||
}
|
||||
c.JSON(http.StatusOK, Response{Code: 404})
|
||||
|
||||
2
screenlog.0
Normal file
2
screenlog.0
Normal file
@@ -0,0 +1,2 @@
|
||||
Cannot exec './proxyserver': 权限不够
|
||||
|
||||
9
start.sh
Executable file
9
start.sh
Executable file
@@ -0,0 +1,9 @@
|
||||
DISPLAY=:99
|
||||
|
||||
rm /tmp/chromeproxy-userdata/ -rf
|
||||
|
||||
screen -L -dmS google-chrome-web google-chrome --load-extension=../chromeproxy --user-data-dir=/tmp/chromeproxy-userdata --ignore-certificate-errors --disable-dev-shm-usage --mute-audio --safebrowsing-disable-auto-update --disable-gpu --no-sandbox --disable-blink-features=AutomationControlled --disable-infobars --allow-running-insecure-content --disable-features=TranslateUI --test-type --no-report-upload --disable-breakpad --no-first-run --display=$DISPLAY
|
||||
sleep 2s
|
||||
echo "启动浏览器..."
|
||||
screen -L -dmS proxyserver ./proxyserver
|
||||
echo "启动代理服务器..."
|
||||
Reference in New Issue
Block a user