From 7b5c3717baeb63456a2f7b1193c6bb767a4a6ec3 Mon Sep 17 00:00:00 2001
From: eson <eson.hsm@nonolive.com>
Date: Tue, 24 Nov 2020 19:54:52 +0800
Subject: [PATCH] =?UTF-8?q?TODO:=20=E5=A4=84=E7=90=86=E9=81=87=E5=88=B0clo?=
 =?UTF-8?q?udflare=E9=A1=B5=E9=9D=A2=E6=8B=BFcookie=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E7=9A=845=E5=A6=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.sh                         |  1 +
 chromeproxy/background/worker.js |  1 +
 proxyserver/callback.go          |  1 -
 proxyserver/go.mod               |  2 +-
 proxyserver/go.sum               |  2 ++
 proxyserver/router.go            | 13 ++++++++++---
 stop.sh                          |  4 ++++
 7 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 stop.sh

diff --git a/build.sh b/build.sh
index bd82801..d0641c3 100755
--- a/build.sh
+++ b/build.sh
@@ -2,4 +2,5 @@ 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
diff --git a/chromeproxy/background/worker.js b/chromeproxy/background/worker.js
index 0def62c..da41e2a 100644
--- a/chromeproxy/background/worker.js
+++ b/chromeproxy/background/worker.js
@@ -62,6 +62,7 @@ function FinishTask(sender, content) {
   var formdata = new FormData();
   formdata.append("taskid", task.data.taskid);
   formdata.append("content", content);
+  
   delete task_manager[sender.tab.id];
   chrome.tabs.remove(sender.tab.id);
   fetch(FinishTaskUrl, { method: "POST", body: formdata }).then(function (response) {
diff --git a/proxyserver/callback.go b/proxyserver/callback.go
index 30f7dca..757186e 100644
--- a/proxyserver/callback.go
+++ b/proxyserver/callback.go
@@ -19,7 +19,6 @@ func CallbackServer(task *Task) {
 	defer task.lock.Unlock()
 	if callback, ok := task.data["callback"]; ok {
 		cburl := callback.(string)
-		// log.Println(cburl)
 		_, err := requests.NewSession().Post(cburl).SetBodyAuto(task.data, requests.TypeFormData).Execute()
 		if err != nil {
 			log.Println(err)
diff --git a/proxyserver/go.mod b/proxyserver/go.mod
index e9f73f3..6420842 100644
--- a/proxyserver/go.mod
+++ b/proxyserver/go.mod
@@ -4,7 +4,7 @@ go 1.15
 
 require (
 	github.com/474420502/focus v0.12.0
-	github.com/474420502/requests v1.10.0
+	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
diff --git a/proxyserver/go.sum b/proxyserver/go.sum
index 10e0513..24c9484 100644
--- a/proxyserver/go.sum
+++ b/proxyserver/go.sum
@@ -3,6 +3,8 @@ github.com/474420502/focus v0.12.0 h1:+icbmj7IEOefvTegHt5EpcHt6WFbe2miIrceUJx2Ev
 github.com/474420502/focus v0.12.0/go.mod h1:d0PMjtMxFz1a9HIhwyFPkWa+JF+0LgOrEUfd8iZka6s=
 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=
diff --git a/proxyserver/router.go b/proxyserver/router.go
index 48d9007..b722616 100644
--- a/proxyserver/router.go
+++ b/proxyserver/router.go
@@ -70,14 +70,21 @@ func PutTask(c *gin.Context) {
 		now := time.Now()
 		tid := snowNode.Generate().Base64()
 		label := c.PostForm("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 callback := c.PostForm("callback"); callback != "" {
-			data.Store("callback", callback)
-		}
+
 		taskQueue.Push(tid, data)
 		oplog.Write(data)
 		c.JSON(http.StatusOK, Response{Code: 200, Message: "ok", Data: data})
diff --git a/stop.sh b/stop.sh
new file mode 100644
index 0000000..4bc53cb
--- /dev/null
+++ b/stop.sh
@@ -0,0 +1,4 @@
+for quitlist in google-chrome-web proxyserver
+do
+    screen -S $quitlist -X quit 
+done